From 884678e808fc64ef95a0004aeacef2fb7ca93c37 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 5 May 2022 14:17:42 -0700
Subject: [PATCH 01/15] Convert some of the watchEnvironment tests to baselines
 for updating later

---
 src/harness/virtualFileSystemWithWatch.ts     |   64 -
 src/testRunner/unittests/tscWatch/helpers.ts  |    4 -
 .../tsserver/cachingFileSystemInformation.ts  |  657 ++---
 .../unittests/tsserver/configFileSearch.ts    |   98 +-
 .../unittests/tsserver/configuredProjects.ts  |  192 +-
 .../tsserver/events/projectLoading.ts         |    2 +-
 .../events/projectUpdatedInBackground.ts      |  150 +-
 src/testRunner/unittests/tsserver/helpers.ts  |   39 +-
 .../unittests/tsserver/inferredProjects.ts    |   16 +-
 .../tsserver/moduleSpecifierCache.ts          |    8 +-
 .../tsserver/partialSemanticServer.ts         |   91 +-
 .../tsserver/projectReferencesSourcemap.ts    | 2132 +++--------------
 src/testRunner/unittests/tsserver/projects.ts |   11 +-
 .../tsserver/projectsWithReferences.ts        |  308 +--
 .../unittests/tsserver/resolutionCache.ts     |  421 +---
 .../unittests/tsserver/syntacticServer.ts     |   42 +-
 .../unittests/tsserver/typingsInstaller.ts    |   78 +-
 .../unittests/tsserver/watchEnvironment.ts    |  681 ++----
 .../loads-missing-files-from-disk.js          |   65 +
 ...onfig-timeout-occurs-after-installation.js |  656 +++++
 ...g-timeouts-occur-inbetween-installation.js |  704 ++++++
 ...-file-with-case-insensitive-file-system.js |  140 ++
 ...ig-file-with-case-sensitive-file-system.js |  140 ++
 .../when-calling-goto-definition-of-module.js |   86 +
 .../works-using-legacy-resolution-logic.js    |  108 +
 ...-searching-for-inferred-project-again-2.js |  101 +
 ...en-searching-for-inferred-project-again.js |  103 +
 .../tsconfig-for-the-file-does-not-exist.js   |  164 ++
 .../tsconfig-for-the-file-exists.js           |  171 ++
 .../when-projectRootPath-is-not-present.js    |   38 +
 ...esent-but-file-is-not-from-project-root.js |   38 +
 ...oject-as-part-of-configured-file-update.js |  374 +++
 ...onfig-file-in-a-folder-with-loose-files.js |  208 ++
 ...-a-configured-project-without-file-list.js |   80 +
 ...on-reflected-when-specifying-files-list.js |  102 +
 ...e-configured-project-with-the-file-list.js |   45 +
 ...te-configured-project-without-file-list.js |   45 +
 ...uses-parent-most-node_modules-directory.js |   54 +
 ...the-extended-configs-of-closed-projects.js |  249 ++
 ...e-extended-configs-of-multiple-projects.js |  306 +++
 .../create-inferred-project.js                |   36 +
 ...n-in-contained-node_modules-directories.js |  150 ++
 .../files-are-added-to-inferred-project.js    |   69 +
 ...ternal-module-name-resolution-is-reused.js |   83 +
 ...-include-auto-type-reference-directives.js |   25 +
 ...de-referenced-files-from-unopened-files.js |   25 +
 ...t-go-to-definition-on-module-specifiers.js |   27 +
 .../throws-unsupported-commands.js            |   28 +
 ...dts-changes-with-timeout-before-request.js |  147 ++
 .../dependency-dts-changes.js                 |  117 +
 .../dependency-dts-created.js                 |  212 ++
 .../dependency-dts-deleted.js                 |  212 ++
 .../dependency-dts-not-present.js             |  200 ++
 ...Map-changes-with-timeout-before-request.js |  147 ++
 .../dependency-dtsMap-changes.js              |  117 +
 .../dependency-dtsMap-created.js              |  212 ++
 .../dependency-dtsMap-deleted.js              |  212 ++
 .../dependency-dtsMap-not-present.js          |  202 ++
 .../configHasNoReference/rename-locations.js  |  202 ++
 ...ile-changes-with-timeout-before-request.js |  116 +
 .../usage-file-changes.js                     |  116 +
 ...dts-changes-with-timeout-before-request.js |  147 ++
 .../dependency-dts-changes.js                 |  117 +
 .../dependency-dts-created.js                 |  212 ++
 .../dependency-dts-deleted.js                 |  212 ++
 .../dependency-dts-not-present.js             |  200 ++
 ...Map-changes-with-timeout-before-request.js |  147 ++
 .../dependency-dtsMap-changes.js              |  117 +
 .../dependency-dtsMap-created.js              |  212 ++
 .../dependency-dtsMap-deleted.js              |  212 ++
 .../dependency-dtsMap-not-present.js          |  202 ++
 ...rce-changes-with-timeout-before-request.js |  116 +
 .../dependency-source-changes.js              |  116 +
 .../configWithReference/rename-locations.js   |  202 ++
 ...ile-changes-with-timeout-before-request.js |  116 +
 .../configWithReference/usage-file-changes.js |  116 +
 .../when-projects-are-not-built.js            |  200 ++
 ...dts-changes-with-timeout-before-request.js |  147 ++
 .../dependency-dts-changes.js                 |  117 +
 .../dependency-dts-created.js                 |  212 ++
 .../dependency-dts-deleted.js                 |  212 ++
 .../dependency-dts-not-present.js             |  200 ++
 ...Map-changes-with-timeout-before-request.js |  147 ++
 .../dependency-dtsMap-changes.js              |  117 +
 .../dependency-dtsMap-created.js              |  212 ++
 .../dependency-dtsMap-deleted.js              |  212 ++
 .../dependency-dtsMap-not-present.js          |  202 ++
 .../disabledSourceRef/rename-locations.js     |  202 ++
 ...ile-changes-with-timeout-before-request.js |  116 +
 .../disabledSourceRef/usage-file-changes.js   |  116 +
 ...dts-changes-with-timeout-before-request.js |  252 ++
 .../dependency-dts-changes.js                 |  209 ++
 .../dependency-dts-created.js                 |  381 +++
 .../dependency-dts-deleted.js                 |  371 +++
 .../dependency-dts-not-present.js             |  333 +++
 ...Map-changes-with-timeout-before-request.js |  251 ++
 .../dependency-dtsMap-changes.js              |  208 ++
 .../dependency-dtsMap-created.js              |  369 +++
 .../dependency-dtsMap-deleted.js              |  361 +++
 .../dependency-dtsMap-not-present.js          |  341 +++
 .../goToDef-and-rename-locations.js           |  351 +++
 ...ile-changes-with-timeout-before-request.js |  208 ++
 .../usage-file-changes.js                     |  208 ++
 ...dts-changes-with-timeout-before-request.js |  259 ++
 .../dependency-dts-changes.js                 |  216 ++
 .../dependency-dts-created.js                 |  376 +++
 .../dependency-dts-deleted.js                 |  380 +++
 .../dependency-dts-not-present.js             |  357 +++
 ...Map-changes-with-timeout-before-request.js |  259 ++
 .../dependency-dtsMap-changes.js              |  216 ++
 .../dependency-dtsMap-created.js              |  379 +++
 .../dependency-dtsMap-deleted.js              |  379 +++
 .../dependency-dtsMap-not-present.js          |  359 +++
 ...rce-changes-with-timeout-before-request.js |  214 ++
 .../dependency-source-changes.js              |  214 ++
 .../gotoDef-and-rename-locations.js           |  359 +++
 ...ile-changes-with-timeout-before-request.js |  216 ++
 .../configWithReference/usage-file-changes.js |  216 ++
 .../when-projects-are-not-built.js            |  357 +++
 ...dts-changes-with-timeout-before-request.js |  259 ++
 .../dependency-dts-changes.js                 |  216 ++
 .../dependency-dts-created.js                 |  388 +++
 .../dependency-dts-deleted.js                 |  378 +++
 .../dependency-dts-not-present.js             |  340 +++
 ...Map-changes-with-timeout-before-request.js |  258 ++
 .../dependency-dtsMap-changes.js              |  215 ++
 .../dependency-dtsMap-created.js              |  376 +++
 .../dependency-dtsMap-deleted.js              |  368 +++
 .../dependency-dtsMap-not-present.js          |  348 +++
 .../gotoDef-and-rename-locations.js           |  358 +++
 ...ile-changes-with-timeout-before-request.js |  215 ++
 .../disabledSourceRef/usage-file-changes.js   |  215 ++
 .../can-go-to-definition-correctly.js         |  213 ++
 ...dts-changes-with-timeout-before-request.js |  153 ++
 .../dependency-dts-changes.js                 |  123 +
 .../dependency-dts-created.js                 |  233 ++
 .../dependency-dts-deleted.js                 |  233 ++
 .../dependency-dts-not-present.js             |  201 ++
 ...Map-changes-with-timeout-before-request.js |  152 ++
 .../dependency-dtsMap-changes.js              |  122 +
 .../dependency-dtsMap-created.js              |  225 ++
 .../dependency-dtsMap-deleted.js              |  225 ++
 .../dependency-dtsMap-not-present.js          |  211 ++
 ...ile-changes-with-timeout-before-request.js |  121 +
 .../usage-file-changes.js                     |  121 +
 .../can-go-to-definition-correctly.js         |  232 ++
 ...dts-changes-with-timeout-before-request.js |  134 ++
 .../dependency-dts-changes.js                 |  134 ++
 .../dependency-dts-created.js                 |  237 ++
 .../dependency-dts-deleted.js                 |  237 ++
 .../dependency-dts-not-present.js             |  232 ++
 ...Map-changes-with-timeout-before-request.js |  134 ++
 .../dependency-dtsMap-changes.js              |  134 ++
 .../dependency-dtsMap-created.js              |  236 ++
 .../dependency-dtsMap-deleted.js              |  236 ++
 .../dependency-dtsMap-not-present.js          |  232 ++
 ...rce-changes-with-timeout-before-request.js |  171 ++
 .../dependency-source-changes.js              |  141 ++
 ...ile-changes-with-timeout-before-request.js |  139 ++
 .../configWithReference/usage-file-changes.js |  139 ++
 .../when-projects-are-not-built.js            |  232 ++
 .../can-go-to-definition-correctly.js         |  237 ++
 ...dts-changes-with-timeout-before-request.js |  174 ++
 .../dependency-dts-changes.js                 |  144 ++
 .../dependency-dts-created.js                 |  257 ++
 .../dependency-dts-deleted.js                 |  257 ++
 .../dependency-dts-not-present.js             |  225 ++
 ...Map-changes-with-timeout-before-request.js |  173 ++
 .../dependency-dtsMap-changes.js              |  143 ++
 .../dependency-dtsMap-created.js              |  249 ++
 .../dependency-dtsMap-deleted.js              |  249 ++
 .../dependency-dtsMap-not-present.js          |  235 ++
 ...ile-changes-with-timeout-before-request.js |  142 ++
 .../disabledSourceRef/usage-file-changes.js   |  142 ++
 ...he-session-and-project-is-at-root-level.js |   73 +
 ...ession-and-project-is-not-at-root-level.js |  132 +
 ...oundUpdate-and-project-is-at-root-level.js |   84 +
 ...Update-and-project-is-not-at-root-level.js |  146 ++
 ...oundUpdate-and-project-is-at-root-level.js |   86 +
 ...Update-and-project-is-not-at-root-level.js |  145 ++
 ...ith-mixed-content-are-handled-correctly.js |   34 +
 .../projectsWithReferences/sample-project.js  |  201 ++
 ...es-with-deleting-referenced-config-file.js |  245 ++
 ...ing-transitively-referenced-config-file.js |  179 ++
 ...ces-with-edit-in-referenced-config-file.js |  251 ++
 ...ive-references-with-edit-on-config-file.js |  293 +++
 ...ansitive-references-with-non-local-edit.js |  131 +
 ...es-with-deleting-referenced-config-file.js |  262 ++
 ...ing-transitively-referenced-config-file.js |  192 ++
 ...les-with-edit-in-referenced-config-file.js |  257 ++
 ...-without-files-with-edit-on-config-file.js |  299 +++
 ...ences-without-files-with-non-local-edit.js |  137 ++
 ...unnecessary-lookup-invalidation-on-save.js |   87 +
 ...an-load-typings-that-are-proper-modules.js |   46 +
 ...le-name-from-files-in-different-folders.js |  179 ++
 ...e-module-name-from-files-in-same-folder.js |  117 +
 ...ative-module-name-from-inferred-project.js |  199 ++
 ...le-name-from-files-in-different-folders.js |  163 ++
 ...e-module-name-from-files-in-same-folder.js |  101 +
 .../resolutionCache/when-resolution-fails.js  |   73 +
 .../when-resolves-to-ambient-module.js        |   72 +
 ...ed-project-and-semantic-operations-fail.js |  108 +
 ...-include-auto-type-reference-directives.js |   17 +
 .../throws-on-unsupported-commands.js         |   20 +
 ...projects-discover-from-bower_components.js |  101 +
 .../typingsInstaller/configured-projects.js   |   72 +
 ...utions-pointing-to-js-on-typing-install.js |   62 +
 ...ect-watch-options-in-host-configuration.js |   50 +
 .../external-project-watch-options.js         |   52 +
 .../watchEnvironment/files-at-root.js         |   60 +
 .../files-at-windows-style-root.js            |   60 +
 .../watchEnvironment/files-not-at-root.js     |   64 +
 .../files-not-at-windows-style-root.js        |   64 +
 ...ect-watch-options-in-host-configuration.js |   59 +
 .../inferred-project-watch-options.js         |   61 +
 .../project-with-ascii-file-names-with-i.js   |   47 +
 .../project-with-ascii-file-names.js          |   47 +
 .../project-with-unicode-file-names.js        |   47 +
 ...files-starting-with-dot-in-node_modules.js |  188 ++
 ...polling-when-file-is-added-to-subfolder.js |  110 +
 ...rectory-when-file-is-added-to-subfolder.js |  139 ++
 ...tchFile-when-file-is-added-to-subfolder.js |  123 +
 ...watching-files-with-network-style-paths.js |  224 ++
 ...excludeDirectories-option-in-configFile.js |   71 +
 ...ludeDirectories-option-in-configuration.js |   69 +
 ...ackPolling-option-as-host-configuration.js |   67 +
 ...th-fallbackPolling-option-in-configFile.js |   70 +
 ...hDirectory-option-as-host-configuration.js |   67 +
 ...ith-watchDirectory-option-in-configFile.js |   67 +
 ...-watchFile-option-as-host-configuration.js |   67 +
 .../with-watchFile-option-in-configFile.js    |   67 +
 231 files changed, 39549 insertions(+), 3930 deletions(-)
 create mode 100644 tests/baselines/reference/tsserver/cachingFileSystemInformation/loads-missing-files-from-disk.js
 create mode 100644 tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeout-occurs-after-installation.js
 create mode 100644 tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeouts-occur-inbetween-installation.js
 create mode 100644 tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js
 create mode 100644 tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js
 create mode 100644 tests/baselines/reference/tsserver/cachingFileSystemInformation/when-calling-goto-definition-of-module.js
 create mode 100644 tests/baselines/reference/tsserver/cachingFileSystemInformation/works-using-legacy-resolution-logic.js
 create mode 100644 tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again-2.js
 create mode 100644 tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again.js
 create mode 100644 tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-does-not-exist.js
 create mode 100644 tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-exists.js
 create mode 100644 tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-present-but-file-is-not-from-project-root.js
 create mode 100644 tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update.js
 create mode 100644 tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js
 create mode 100644 tests/baselines/reference/tsserver/configuredProjects/add-new-files-to-a-configured-project-without-file-list.js
 create mode 100644 tests/baselines/reference/tsserver/configuredProjects/changed-module-resolution-reflected-when-specifying-files-list.js
 create mode 100644 tests/baselines/reference/tsserver/configuredProjects/create-configured-project-with-the-file-list.js
 create mode 100644 tests/baselines/reference/tsserver/configuredProjects/create-configured-project-without-file-list.js
 create mode 100644 tests/baselines/reference/tsserver/configuredProjects/failed-lookup-locations-uses-parent-most-node_modules-directory.js
 create mode 100644 tests/baselines/reference/tsserver/configuredProjects/should-stop-watching-the-extended-configs-of-closed-projects.js
 create mode 100644 tests/baselines/reference/tsserver/configuredProjects/should-watch-the-extended-configs-of-multiple-projects.js
 create mode 100644 tests/baselines/reference/tsserver/inferredProjects/create-inferred-project.js
 create mode 100644 tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-module-specifiers-when-changes-happen-in-contained-node_modules-directories.js
 create mode 100644 tests/baselines/reference/tsserver/partialSemanticServer/files-are-added-to-inferred-project.js
 create mode 100644 tests/baselines/reference/tsserver/partialSemanticServer/should-not-crash-when-external-module-name-resolution-is-reused.js
 create mode 100644 tests/baselines/reference/tsserver/partialSemanticServer/should-not-include-auto-type-reference-directives.js
 create mode 100644 tests/baselines/reference/tsserver/partialSemanticServer/should-not-include-referenced-files-from-unopened-files.js
 create mode 100644 tests/baselines/reference/tsserver/partialSemanticServer/should-support-go-to-definition-on-module-specifiers.js
 create mode 100644 tests/baselines/reference/tsserver/partialSemanticServer/throws-unsupported-commands.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/rename-locations.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/rename-locations.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/when-projects-are-not-built.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/rename-locations.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/goToDef-and-rename-locations.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/gotoDef-and-rename-locations.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/when-projects-are-not-built.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/gotoDef-and-rename-locations.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/can-go-to-definition-correctly.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/can-go-to-definition-correctly.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/when-projects-are-not-built.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/can-go-to-definition-correctly.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-created.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-deleted.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-not-present.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
 create mode 100644 tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes.js
 create mode 100644 tests/baselines/reference/tsserver/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-at-root-level.js
 create mode 100644 tests/baselines/reference/tsserver/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-not-at-root-level.js
 create mode 100644 tests/baselines/reference/tsserver/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js
 create mode 100644 tests/baselines/reference/tsserver/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
 create mode 100644 tests/baselines/reference/tsserver/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js
 create mode 100644 tests/baselines/reference/tsserver/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
 create mode 100644 tests/baselines/reference/tsserver/projects/files-with-mixed-content-are-handled-correctly.js
 create mode 100644 tests/baselines/reference/tsserver/projectsWithReferences/sample-project.js
 create mode 100644 tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-referenced-config-file.js
 create mode 100644 tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-transitively-referenced-config-file.js
 create mode 100644 tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-in-referenced-config-file.js
 create mode 100644 tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-on-config-file.js
 create mode 100644 tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-non-local-edit.js
 create mode 100644 tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-referenced-config-file.js
 create mode 100644 tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-transitively-referenced-config-file.js
 create mode 100644 tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-in-referenced-config-file.js
 create mode 100644 tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-on-config-file.js
 create mode 100644 tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-non-local-edit.js
 create mode 100644 tests/baselines/reference/tsserver/resolutionCache/avoid-unnecessary-lookup-invalidation-on-save.js
 create mode 100644 tests/baselines/reference/tsserver/resolutionCache/can-load-typings-that-are-proper-modules.js
 create mode 100644 tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-different-folders.js
 create mode 100644 tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-same-folder.js
 create mode 100644 tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-inferred-project.js
 create mode 100644 tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-different-folders.js
 create mode 100644 tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-same-folder.js
 create mode 100644 tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js
 create mode 100644 tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js
 create mode 100644 tests/baselines/reference/tsserver/syntacticServer/files-go-to-inferred-project-and-semantic-operations-fail.js
 create mode 100644 tests/baselines/reference/tsserver/syntacticServer/should-not-include-auto-type-reference-directives.js
 create mode 100644 tests/baselines/reference/tsserver/syntacticServer/throws-on-unsupported-commands.js
 create mode 100644 tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js
 create mode 100644 tests/baselines/reference/tsserver/typingsInstaller/configured-projects.js
 create mode 100644 tests/baselines/reference/tsserver/typingsInstaller/redo-resolutions-pointing-to-js-on-typing-install.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options-in-host-configuration.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/files-at-root.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/files-at-windows-style-root.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/files-not-at-root.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/files-not-at-windows-style-root.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options-in-host-configuration.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names-with-i.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/project-with-unicode-file-names.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configFile.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configuration.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-as-host-configuration.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-in-configFile.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-as-host-configuration.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-in-configFile.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-as-host-configuration.js
 create mode 100644 tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-in-configFile.js

diff --git a/src/harness/virtualFileSystemWithWatch.ts b/src/harness/virtualFileSystemWithWatch.ts
index 829d6e8fa41f4..80746cff259c7 100644
--- a/src/harness/virtualFileSystemWithWatch.ts
+++ b/src/harness/virtualFileSystemWithWatch.ts
@@ -195,70 +195,6 @@ interface Array<T> { length: number; [n: number]: T; }`
         checkMap(caption, arrayToMap(actual, identity), expected, /*eachKeyCount*/ undefined);
     }
 
-    export function checkWatchedFiles(host: TestServerHost, expectedFiles: readonly string[], additionalInfo?: string) {
-        checkMap(`watchedFiles:: ${additionalInfo || ""}::`, host.watchedFiles, expectedFiles, /*eachKeyCount*/ undefined);
-    }
-
-    export interface WatchFileDetails {
-        fileName: string;
-        pollingInterval: PollingInterval;
-    }
-    export function checkWatchedFilesDetailed(host: TestServerHost, expectedFiles: ReadonlyESMap<string, number>, expectedDetails?: ESMap<string, WatchFileDetails[]>): void;
-    export function checkWatchedFilesDetailed(host: TestServerHost, expectedFiles: readonly string[], eachFileWatchCount: number, expectedDetails?: ESMap<string, WatchFileDetails[]>): void;
-    export function checkWatchedFilesDetailed(host: TestServerHost, expectedFiles: ReadonlyESMap<string, number> | readonly string[], eachFileWatchCountOrExpectedDetails?: number | ESMap<string, WatchFileDetails[]>, expectedDetails?: ESMap<string, WatchFileDetails[]>) {
-        if (!isNumber(eachFileWatchCountOrExpectedDetails)) expectedDetails = eachFileWatchCountOrExpectedDetails;
-        if (isArray(expectedFiles)) {
-            checkMap(
-                "watchedFiles",
-                host.watchedFiles,
-                expectedFiles,
-                eachFileWatchCountOrExpectedDetails as number,
-                [expectedDetails, ({ fileName, pollingInterval }) => ({ fileName, pollingInterval })]
-            );
-        }
-        else {
-            checkMap(
-                "watchedFiles",
-                host.watchedFiles,
-                expectedFiles,
-                [expectedDetails, ({ fileName, pollingInterval }) => ({ fileName, pollingInterval })]
-            );
-        }
-    }
-
-    export function checkWatchedDirectories(host: TestServerHost, expectedDirectories: string[], recursive: boolean) {
-        checkMap(`watchedDirectories${recursive ? " recursive" : ""}`, recursive ? host.fsWatchesRecursive : host.fsWatches, expectedDirectories, /*eachKeyCount*/ undefined);
-    }
-
-    export interface WatchDirectoryDetails {
-        directoryName: string;
-        fallbackPollingInterval: PollingInterval;
-        fallbackOptions: WatchOptions | undefined;
-    }
-    export function checkWatchedDirectoriesDetailed(host: TestServerHost, expectedDirectories: ReadonlyESMap<string, number>, recursive: boolean, expectedDetails?: ESMap<string, WatchDirectoryDetails[]>): void;
-    export function checkWatchedDirectoriesDetailed(host: TestServerHost, expectedDirectories: readonly string[], eachDirectoryWatchCount: number, recursive: boolean, expectedDetails?: ESMap<string, WatchDirectoryDetails[]>): void;
-    export function checkWatchedDirectoriesDetailed(host: TestServerHost, expectedDirectories: ReadonlyESMap<string, number> | readonly string[], recursiveOrEachDirectoryWatchCount: boolean | number, recursiveOrExpectedDetails?: boolean | ESMap<string, WatchDirectoryDetails[]>, expectedDetails?: ESMap<string, WatchDirectoryDetails[]>) {
-        if (typeof recursiveOrExpectedDetails !== "boolean") expectedDetails = recursiveOrExpectedDetails;
-        if (isArray(expectedDirectories)) {
-            checkMap(
-                `fsWatches${recursiveOrExpectedDetails ? " recursive" : ""}`,
-                recursiveOrExpectedDetails as boolean ? host.fsWatchesRecursive : host.fsWatches,
-                expectedDirectories,
-                recursiveOrEachDirectoryWatchCount as number,
-                [expectedDetails, ({ directoryName, fallbackPollingInterval, fallbackOptions }) => ({ directoryName, fallbackPollingInterval, fallbackOptions })]
-            );
-        }
-        else {
-            recursiveOrExpectedDetails = recursiveOrEachDirectoryWatchCount as boolean;
-            checkMap(
-                `fsWatches${recursiveOrExpectedDetails ? " recursive" : ""}`,
-                recursiveOrExpectedDetails ? host.fsWatchesRecursive : host.fsWatches,
-                expectedDirectories,
-                [expectedDetails, ({ directoryName, fallbackPollingInterval, fallbackOptions }) => ({ directoryName, fallbackPollingInterval, fallbackOptions })]
-            );
-        }
-    }
-
     export function checkOutputContains(host: TestServerHost, expected: readonly string[]) {
         const mapExpected = new Set(expected);
         const mapSeen = new Set<string>();
diff --git a/src/testRunner/unittests/tscWatch/helpers.ts b/src/testRunner/unittests/tscWatch/helpers.ts
index 501264b40ff32..70b79aba0b605 100644
--- a/src/testRunner/unittests/tscWatch/helpers.ts
+++ b/src/testRunner/unittests/tscWatch/helpers.ts
@@ -7,10 +7,6 @@ namespace ts.tscWatch {
     export import libFile = TestFSWithWatch.libFile;
     export import createWatchedSystem = TestFSWithWatch.createWatchedSystem;
     export import checkArray = TestFSWithWatch.checkArray;
-    export import checkWatchedFiles = TestFSWithWatch.checkWatchedFiles;
-    export import checkWatchedFilesDetailed = TestFSWithWatch.checkWatchedFilesDetailed;
-    export import checkWatchedDirectories = TestFSWithWatch.checkWatchedDirectories;
-    export import checkWatchedDirectoriesDetailed = TestFSWithWatch.checkWatchedDirectoriesDetailed;
     export import checkOutputContains = TestFSWithWatch.checkOutputContains;
     export import checkOutputDoesNotContain = TestFSWithWatch.checkOutputDoesNotContain;
 
diff --git a/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts b/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts
index 34863897e8abb..0f724ceb2f139 100644
--- a/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts
+++ b/src/testRunner/unittests/tsserver/cachingFileSystemInformation.ts
@@ -1,8 +1,4 @@
 namespace ts.projectSystem {
-    function getNumberOfWatchesInvokedForRecursiveWatches(recursiveWatchedDirs: string[], file: string) {
-        return countWhere(recursiveWatchedDirs, dir => file.length > dir.length && startsWith(file, dir) && file[dir.length] === directorySeparator);
-    }
-
     describe("unittests:: tsserver:: CachingFileSystemInformation:: tsserverProjectSystem CachingFileSystemInformation", () => {
         enum CalledMapsWithSingleArg {
             fileExists = "fileExists",
@@ -15,7 +11,7 @@ namespace ts.projectSystem {
         }
         type CalledMaps = CalledMapsWithSingleArg | CalledMapsWithFiveArgs;
         type CalledWithFiveArgs = [readonly string[], readonly string[], readonly string[], number];
-        function createCallsTrackingHost(host: TestServerHost) {
+        function createLoggerTrackingHostCalls(host: TestServerHost) {
             const calledMaps: Record<CalledMapsWithSingleArg, MultiMap<string, true>> & Record<CalledMapsWithFiveArgs, MultiMap<string, CalledWithFiveArgs>> = {
                 fileExists: setCallsTrackingWithSingleArgFn(CalledMapsWithSingleArg.fileExists),
                 directoryExists: setCallsTrackingWithSingleArgFn(CalledMapsWithSingleArg.directoryExists),
@@ -24,15 +20,7 @@ namespace ts.projectSystem {
                 readDirectory: setCallsTrackingWithFiveArgFn(CalledMapsWithFiveArgs.readDirectory)
             };
 
-            return {
-                verifyNoCall,
-                verifyCalledOnEachEntryNTimes,
-                verifyCalledOnEachEntry,
-                verifyNoHostCalls,
-                verifyNoHostCallsExceptFileExistsOnce,
-                verifyCalledOn,
-                clear
-            };
+            return logCacheAndClear;
 
             function setCallsTrackingWithSingleArgFn(prop: CalledMapsWithSingleArg) {
                 const calledMap = createMultiMap<true>();
@@ -54,49 +42,25 @@ namespace ts.projectSystem {
                 return calledMap;
             }
 
-            function verifyCalledOn(callback: CalledMaps, name: string) {
-                const calledMap = calledMaps[callback];
-                const result = calledMap.get(name);
-                assert.isTrue(result && !!result.length, `${callback} should be called with name: ${name}: ${arrayFrom(calledMap.keys())}`);
+            function logCacheEntry(logger: Logger, callback: CalledMaps) {
+                const result = arrayFrom<[string, (true | CalledWithFiveArgs)[]], { key: string, count: number }>(calledMaps[callback].entries(), ([key, arr]) => ({ key, count: arr.length }));
+                logger.info(`${callback}:: ${JSON.stringify(result)}`);
+                calledMaps[callback].clear();
             }
 
-            function verifyNoCall(callback: CalledMaps) {
-                const calledMap = calledMaps[callback];
-                assert.equal(calledMap.size, 0, `${callback} shouldn't be called: ${arrayFrom(calledMap.keys())}`);
-            }
-
-            function verifyCalledOnEachEntry(callback: CalledMaps, expectedKeys: ESMap<string, number>) {
-                TestFSWithWatch.checkMap<true | CalledWithFiveArgs>(callback, calledMaps[callback], expectedKeys);
-            }
-
-            function verifyCalledOnEachEntryNTimes(callback: CalledMaps, expectedKeys: readonly string[], nTimes: number) {
-                TestFSWithWatch.checkMap<true | CalledWithFiveArgs>(callback, calledMaps[callback], expectedKeys, nTimes);
-            }
-
-            function verifyNoHostCalls() {
-                iterateOnCalledMaps(key => verifyNoCall(key));
-            }
-
-            function verifyNoHostCallsExceptFileExistsOnce(expectedKeys: readonly string[]) {
-                verifyCalledOnEachEntryNTimes(CalledMapsWithSingleArg.fileExists, expectedKeys, 1);
-                verifyNoCall(CalledMapsWithSingleArg.directoryExists);
-                verifyNoCall(CalledMapsWithSingleArg.getDirectories);
-                verifyNoCall(CalledMapsWithSingleArg.readFile);
-                verifyNoCall(CalledMapsWithFiveArgs.readDirectory);
-            }
-
-            function clear() {
-                iterateOnCalledMaps(key => calledMaps[key].clear());
+            function logCacheAndClear(logger: Logger) {
+                logCacheEntry(logger, CalledMapsWithSingleArg.fileExists);
+                logCacheEntry(logger, CalledMapsWithSingleArg.directoryExists);
+                logCacheEntry(logger, CalledMapsWithSingleArg.getDirectories);
+                logCacheEntry(logger, CalledMapsWithSingleArg.readFile);
+                logCacheEntry(logger, CalledMapsWithFiveArgs.readDirectory);
             }
+        }
 
-            function iterateOnCalledMaps(cb: (key: CalledMaps) => void) {
-                for (const key in CalledMapsWithSingleArg) {
-                    cb(key as CalledMapsWithSingleArg);
-                }
-                for (const key in CalledMapsWithFiveArgs) {
-                    cb(key as CalledMapsWithFiveArgs);
-                }
-            }
+        function logSemanticDiagnostics(projectService: server.ProjectService, project: server.Project, file: File) {
+            const diags = project.getLanguageService().getSemanticDiagnostics(file.path);
+            projectService.logger.info(`getSemanticDiagnostics:: ${file.path}:: ${diags.length}`);
+            diags.forEach(d => projectService.logger.info(formatDiagnostic(d, project)));
         }
 
         it("works using legacy resolution logic", () => {
@@ -112,108 +76,50 @@ namespace ts.projectSystem {
             };
 
             const host = createServerHost([root, imported]);
-            const projectService = createProjectService(host);
+            const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
             projectService.setCompilerOptionsForInferredProjects({ module: ModuleKind.AMD, noLib: true });
             projectService.openClientFile(root.path);
-            checkNumberOfProjects(projectService, { inferredProjects: 1 });
             const project = projectService.inferredProjects[0];
             const rootScriptInfo = project.getRootScriptInfos()[0];
             assert.equal(rootScriptInfo.fileName, root.path);
 
             // ensure that imported file was found
-            verifyImportedDiagnostics();
+            logSemanticDiagnostics(projectService, project, imported);
 
-            const callsTrackingHost = createCallsTrackingHost(host);
+            const logCacheAndClear = createLoggerTrackingHostCalls(host);
 
             // trigger synchronization to make sure that import will be fetched from the cache
             // ensure file has correct number of errors after edit
             editContent(`import {x} from "f1";
                  var x: string = 1;`);
-            verifyImportedDiagnostics();
-            callsTrackingHost.verifyNoHostCalls();
+            logSemanticDiagnostics(projectService, project, imported);
+            logCacheAndClear(projectService.logger);
 
             // trigger synchronization to make sure that the host will try to find 'f2' module on disk
             editContent(`import {x} from "f2"`);
             try {
                 // trigger synchronization to make sure that the host will try to find 'f2' module on disk
-                verifyImportedDiagnostics();
-                assert.isTrue(false, `should not find file '${imported.path}'`);
+                logSemanticDiagnostics(projectService, project, imported);
             }
             catch (e) {
-                assert.isTrue(e.message.indexOf(`Could not find source file: '${imported.path}'.`) === 0, `Actual: ${e.message}`);
+                projectService.logger.info(e.message);
             }
-            const f2Lookups = getLocationsForModuleLookup("f2");
-            callsTrackingHost.verifyCalledOnEachEntryNTimes(CalledMapsWithSingleArg.fileExists, f2Lookups, 1);
-            const f2DirLookups = getLocationsForDirectoryLookup();
-            callsTrackingHost.verifyCalledOnEachEntry(CalledMapsWithSingleArg.directoryExists, f2DirLookups);
-            callsTrackingHost.verifyNoCall(CalledMapsWithSingleArg.getDirectories);
-            callsTrackingHost.verifyNoCall(CalledMapsWithSingleArg.readFile);
-            callsTrackingHost.verifyNoCall(CalledMapsWithFiveArgs.readDirectory);
+            logCacheAndClear(projectService.logger);
 
             editContent(`import {x} from "f1"`);
-            verifyImportedDiagnostics();
-            const f1Lookups = f2Lookups.map(s => s.replace("f2", "f1"));
-            f1Lookups.length = f1Lookups.indexOf(imported.path) + 1;
-            const f1DirLookups = ["/c/d", "/c", ...mapCombinedPathsInAncestor(getDirectoryPath(root.path), nodeModulesAtTypes, returnTrue)];
-            vertifyF1Lookups();
+            logSemanticDiagnostics(projectService, project, imported);
+            logCacheAndClear(projectService.logger);
 
             // setting compiler options discards module resolution cache
-            callsTrackingHost.clear();
             projectService.setCompilerOptionsForInferredProjects({ module: ModuleKind.AMD, noLib: true, target: ScriptTarget.ES5 });
-            verifyImportedDiagnostics();
-            vertifyF1Lookups();
-
-            function vertifyF1Lookups() {
-                callsTrackingHost.verifyCalledOnEachEntryNTimes(CalledMapsWithSingleArg.fileExists, f1Lookups, 1);
-                callsTrackingHost.verifyCalledOnEachEntryNTimes(CalledMapsWithSingleArg.directoryExists, f1DirLookups, 1);
-                callsTrackingHost.verifyNoCall(CalledMapsWithSingleArg.getDirectories);
-                callsTrackingHost.verifyNoCall(CalledMapsWithSingleArg.readFile);
-                callsTrackingHost.verifyNoCall(CalledMapsWithFiveArgs.readDirectory);
-            }
+            logSemanticDiagnostics(projectService, project, imported);
+            logCacheAndClear(projectService.logger);
+            baselineTsserverLogs("cachingFileSystemInformation", "works using legacy resolution logic", projectService);
 
             function editContent(newContent: string) {
-                callsTrackingHost.clear();
                 rootScriptInfo.editContent(0, rootContent.length, newContent);
                 rootContent = newContent;
             }
-
-            function verifyImportedDiagnostics() {
-                const diags = project.getLanguageService().getSemanticDiagnostics(imported.path);
-                assert.equal(diags.length, 1);
-                const diag = diags[0];
-                assert.equal(diag.code, Diagnostics.Cannot_find_name_0.code);
-                assert.equal(flattenDiagnosticMessageText(diag.messageText, "\n"), "Cannot find name 'foo'.");
-            }
-
-            function getLocationsForModuleLookup(module: string) {
-                const locations: string[] = [];
-                forEachAncestorDirectory(getDirectoryPath(root.path), ancestor => {
-                    locations.push(
-                        combinePaths(ancestor, `${module}.ts`),
-                        combinePaths(ancestor, `${module}.tsx`),
-                        combinePaths(ancestor, `${module}.d.ts`)
-                    );
-                });
-                forEachAncestorDirectory(getDirectoryPath(root.path), ancestor => {
-                    locations.push(
-                        combinePaths(ancestor, `${module}.js`),
-                        combinePaths(ancestor, `${module}.jsx`)
-                    );
-                });
-                return locations;
-            }
-
-            function getLocationsForDirectoryLookup() {
-                const result = new Map<string, number>();
-                forEachAncestorDirectory(getDirectoryPath(root.path), ancestor => {
-                    // To resolve modules
-                    result.set(ancestor, 2);
-                    // for type roots
-                    result.set(combinePaths(ancestor, nodeModules), 1);
-                    result.set(combinePaths(ancestor, nodeModulesAtTypes), 1);
-                });
-                return result;
-            }
         });
 
         it("loads missing files from disk", () => {
@@ -228,29 +134,22 @@ namespace ts.projectSystem {
             };
 
             const host = createServerHost([root]);
-            const projectService = createProjectService(host);
+            const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
             projectService.setCompilerOptionsForInferredProjects({ module: ModuleKind.AMD, noLib: true });
-            const callsTrackingHost = createCallsTrackingHost(host);
+            const logCacheAndClear = createLoggerTrackingHostCalls(host);
             projectService.openClientFile(root.path);
-            checkNumberOfProjects(projectService, { inferredProjects: 1 });
             const project = projectService.inferredProjects[0];
             const rootScriptInfo = project.getRootScriptInfos()[0];
             assert.equal(rootScriptInfo.fileName, root.path);
 
-            let diags = project.getLanguageService().getSemanticDiagnostics(root.path);
-            assert.equal(diags.length, 1);
-            const diag = diags[0];
-            assert.equal(diag.code, Diagnostics.Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_node_or_to_add_aliases_to_the_paths_option.code);
-            assert.equal(flattenDiagnosticMessageText(diag.messageText, "\n"), "Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?");
-            callsTrackingHost.verifyCalledOn(CalledMapsWithSingleArg.fileExists, imported.path);
-
+            logSemanticDiagnostics(projectService, project, root);
+            logCacheAndClear(projectService.logger);
 
-            callsTrackingHost.clear();
             host.writeFile(imported.path, imported.content);
             host.runQueuedTimeoutCallbacks();
-            diags = project.getLanguageService().getSemanticDiagnostics(root.path);
-            assert.equal(diags.length, 0);
-            callsTrackingHost.verifyCalledOn(CalledMapsWithSingleArg.fileExists, imported.path);
+            logSemanticDiagnostics(projectService, project, root);
+            logCacheAndClear(projectService.logger);
+            baselineTsserverLogs("cachingFileSystemInformation", "loads missing files from disk", projectService);
         });
 
         it("when calling goto definition of module", () => {
@@ -296,17 +195,9 @@ namespace ts.projectSystem {
             };
             const projectFiles = [clientFile, anotherModuleFile, moduleFile, tsconfigFile];
             const host = createServerHost(projectFiles);
-            const session = createSession(host);
-            const projectService = session.getProjectService();
-            const { configFileName } = projectService.openClientFile(clientFile.path);
-
-            assert.isDefined(configFileName, `should find config`);
-            checkNumberOfConfiguredProjects(projectService, 1);
-
-            const project = projectService.configuredProjects.get(tsconfigFile.path)!;
-            checkProjectActualFiles(project, map(projectFiles, f => f.path));
-
-            const callsTrackingHost = createCallsTrackingHost(host);
+            const session = createSession(host, { logger: createLoggerWithInMemoryLogs() });
+            openFilesForSession([clientFile], session);
+            const logCacheAndClear = createLoggerTrackingHostCalls(host);
 
             // Get definitions shouldnt make host requests
             const getDefinitionRequest = makeSessionRequest<protocol.FileLocationRequestArgs>(protocol.CommandTypes.Definition, {
@@ -315,137 +206,90 @@ namespace ts.projectSystem {
                 line: undefined!, // TODO: GH#18217
                 offset: undefined! // TODO: GH#18217
             });
-            const response = session.executeCommand(getDefinitionRequest).response as server.protocol.FileSpan[];
-            assert.equal(response[0].file, moduleFile.path, "Should go to definition of vessel: response: " + JSON.stringify(response));
-            callsTrackingHost.verifyNoHostCalls();
+            session.executeCommand(getDefinitionRequest);
+            logCacheAndClear(session.logger);
 
             // Open the file should call only file exists on module directory and use cached value for parental directory
-            const { configFileName: config2 } = projectService.openClientFile(moduleFile.path);
-            assert.equal(config2, configFileName);
-            callsTrackingHost.verifyNoHostCallsExceptFileExistsOnce(["/a/b/models/tsconfig.json", "/a/b/models/jsconfig.json"]);
+            openFilesForSession([moduleFile], session);
+            logCacheAndClear(session.logger);
 
-            checkNumberOfConfiguredProjects(projectService, 1);
-            assert.strictEqual(projectService.configuredProjects.get(tsconfigFile.path), project);
+            baselineTsserverLogs("cachingFileSystemInformation", "when calling goto definition of module", session);
         });
 
         describe("WatchDirectories for config file with", () => {
             function verifyWatchDirectoriesCaseSensitivity(useCaseSensitiveFileNames: boolean) {
-                const frontendDir = "/Users/someuser/work/applications/frontend";
-                const toCanonical: (s: string) => Path = useCaseSensitiveFileNames ? s => s as Path : s => s.toLowerCase() as Path;
-                const canonicalFrontendDir = toCanonical(frontendDir);
-                const file1: File = {
-                    path: `${frontendDir}/src/app/utils/Analytic.ts`,
-                    content: "export class SomeClass { };"
-                };
-                const file2: File = {
-                    path: `${frontendDir}/src/app/redux/configureStore.ts`,
-                    content: "export class configureStore { }"
-                };
-                const file3: File = {
-                    path: `${frontendDir}/src/app/utils/Cookie.ts`,
-                    content: "export class Cookie { }"
-                };
-                const es2016LibFile: File = {
-                    path: "/a/lib/lib.es2016.full.d.ts",
-                    content: libFile.content
-                };
-                const typeRoots = ["types", "node_modules/@types"];
-                const types = ["node", "jest"];
-                const tsconfigFile: File = {
-                    path: `${frontendDir}/tsconfig.json`,
-                    content: JSON.stringify({
-                        compilerOptions: {
-                            strict: true,
-                            strictNullChecks: true,
-                            target: "es2016",
-                            module: "commonjs",
-                            moduleResolution: "node",
-                            sourceMap: true,
-                            noEmitOnError: true,
-                            experimentalDecorators: true,
-                            emitDecoratorMetadata: true,
-                            types,
-                            noUnusedLocals: true,
-                            outDir: "./compiled",
-                            typeRoots,
-                            baseUrl: ".",
-                            paths: {
-                                "*": [
-                                    "types/*"
-                                ]
-                            }
-                        },
-                        include: [
-                            "src/**/*"
-                        ],
-                        exclude: [
-                            "node_modules",
-                            "compiled"
-                        ]
-                    })
-                };
-                const projectFiles = [file1, file2, es2016LibFile, tsconfigFile];
-                const host = createServerHost(projectFiles, { useCaseSensitiveFileNames });
-                const projectService = createProjectService(host);
-                const canonicalConfigPath = toCanonical(tsconfigFile.path);
-                const { configFileName } = projectService.openClientFile(file1.path);
-                assert.equal(configFileName, tsconfigFile.path as server.NormalizedPath, `should find config`);
-                checkNumberOfConfiguredProjects(projectService, 1);
-                const watchingRecursiveDirectories = [`${canonicalFrontendDir}/src`, `${canonicalFrontendDir}/types`, `${canonicalFrontendDir}/node_modules`].concat(getNodeModuleDirectories(getDirectoryPath(canonicalFrontendDir)));
-
-                const project = projectService.configuredProjects.get(canonicalConfigPath)!;
-                verifyProjectAndWatchedDirectories();
-
-                const callsTrackingHost = createCallsTrackingHost(host);
-
-                // Create file cookie.ts
-                projectFiles.push(file3);
-                host.writeFile(file3.path, file3.content);
-                host.runQueuedTimeoutCallbacks();
-
-                const canonicalFile3Path = useCaseSensitiveFileNames ? file3.path : file3.path.toLocaleLowerCase();
-                const numberOfTimesWatchInvoked = getNumberOfWatchesInvokedForRecursiveWatches(watchingRecursiveDirectories, canonicalFile3Path);
-                callsTrackingHost.verifyCalledOnEachEntryNTimes(CalledMapsWithSingleArg.fileExists, [canonicalFile3Path], numberOfTimesWatchInvoked);
-                callsTrackingHost.verifyCalledOnEachEntryNTimes(CalledMapsWithSingleArg.directoryExists, [canonicalFile3Path], numberOfTimesWatchInvoked);
-                callsTrackingHost.verifyNoCall(CalledMapsWithSingleArg.getDirectories);
-                callsTrackingHost.verifyCalledOnEachEntryNTimes(CalledMapsWithSingleArg.readFile, [file3.path], 1);
-                callsTrackingHost.verifyNoCall(CalledMapsWithFiveArgs.readDirectory);
-
-                checkNumberOfConfiguredProjects(projectService, 1);
-                assert.strictEqual(projectService.configuredProjects.get(canonicalConfigPath), project);
-                verifyProjectAndWatchedDirectories();
-
-                callsTrackingHost.clear();
-
-                const { configFileName: configFile2 } = projectService.openClientFile(file3.path);
-                assert.equal(configFile2, configFileName);
-
-                checkNumberOfConfiguredProjects(projectService, 1);
-                assert.strictEqual(projectService.configuredProjects.get(canonicalConfigPath), project);
-                verifyProjectAndWatchedDirectories();
-                callsTrackingHost.verifyNoHostCalls();
-
-                function getFilePathIfNotOpen(f: File) {
-                    const path = toCanonical(f.path);
-                    const info = projectService.getScriptInfoForPath(toCanonical(f.path));
-                    return info && info.isScriptOpen() ? undefined : path;
-                }
-
-                function verifyProjectAndWatchedDirectories() {
-                    checkProjectActualFiles(project, map(projectFiles, f => f.path));
-                    checkWatchedFiles(host, mapDefined(projectFiles, getFilePathIfNotOpen));
-                    checkWatchedDirectories(host, watchingRecursiveDirectories, /*recursive*/ true);
-                    checkWatchedDirectories(host, [], /*recursive*/ false);
-                }
+                it(`watchDirectories for config file with case ${useCaseSensitiveFileNames ? "" : "in"}sensitive file system`, () => {
+                    const frontendDir = "/Users/someuser/work/applications/frontend";
+                    const file1: File = {
+                        path: `${frontendDir}/src/app/utils/Analytic.ts`,
+                        content: "export class SomeClass { };"
+                    };
+                    const file2: File = {
+                        path: `${frontendDir}/src/app/redux/configureStore.ts`,
+                        content: "export class configureStore { }"
+                    };
+                    const file3: File = {
+                        path: `${frontendDir}/src/app/utils/Cookie.ts`,
+                        content: "export class Cookie { }"
+                    };
+                    const es2016LibFile: File = {
+                        path: "/a/lib/lib.es2016.full.d.ts",
+                        content: libFile.content
+                    };
+                    const typeRoots = ["types", "node_modules/@types"];
+                    const types = ["node", "jest"];
+                    const tsconfigFile: File = {
+                        path: `${frontendDir}/tsconfig.json`,
+                        content: JSON.stringify({
+                            compilerOptions: {
+                                strict: true,
+                                strictNullChecks: true,
+                                target: "es2016",
+                                module: "commonjs",
+                                moduleResolution: "node",
+                                sourceMap: true,
+                                noEmitOnError: true,
+                                experimentalDecorators: true,
+                                emitDecoratorMetadata: true,
+                                types,
+                                noUnusedLocals: true,
+                                outDir: "./compiled",
+                                typeRoots,
+                                baseUrl: ".",
+                                paths: {
+                                    "*": [
+                                        "types/*"
+                                    ]
+                                }
+                            },
+                            include: [
+                                "src/**/*"
+                            ],
+                            exclude: [
+                                "node_modules",
+                                "compiled"
+                            ]
+                        })
+                    };
+                    const projectFiles = [file1, file2, es2016LibFile, tsconfigFile];
+                    const host = createServerHost(projectFiles, { useCaseSensitiveFileNames });
+                    const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
+                    projectService.openClientFile(file1.path);
+
+                    const logCacheAndClear = createLoggerTrackingHostCalls(host);
+
+                    // Create file cookie.ts
+                    host.writeFile(file3.path, file3.content);
+                    host.runQueuedTimeoutCallbacks();
+                    logCacheAndClear(projectService.logger);
+
+                    projectService.openClientFile(file3.path);
+                    logCacheAndClear(projectService.logger);
+                    baselineTsserverLogs("cachingFileSystemInformation", `watchDirectories for config file with case ${useCaseSensitiveFileNames ? "" : "in"}sensitive file system`, projectService);
+                });
             }
-
-            it("case insensitive file system", () => {
-                verifyWatchDirectoriesCaseSensitivity(/*useCaseSensitiveFileNames*/ false);
-            });
-
-            it("case sensitive file system", () => {
-                verifyWatchDirectoriesCaseSensitivity(/*useCaseSensitiveFileNames*/ true);
-            });
+            verifyWatchDirectoriesCaseSensitivity(/*useCaseSensitiveFileNames*/ false);
+            verifyWatchDirectoriesCaseSensitivity(/*useCaseSensitiveFileNames*/ true);
         });
 
         describe("Subfolder invalidations correctly include parent folder failed lookup locations", () => {
@@ -499,23 +343,24 @@ namespace ts.projectSystem {
         });
 
         describe("Verify npm install in directory with tsconfig file works when", () => {
-            function verifyNpmInstall(timeoutDuringPartialInstallation: boolean) {
-                const root = "/user/username/rootfolder/otherfolder";
-                const getRootedFileOrFolder = (fileOrFolder: File) => {
-                    fileOrFolder.path = root + fileOrFolder.path;
-                    return fileOrFolder;
-                };
-                const app: File = getRootedFileOrFolder({
-                    path: "/a/b/app.ts",
-                    content: "import _ from 'lodash';"
-                });
-                const tsconfigJson: File = getRootedFileOrFolder({
-                    path: "/a/b/tsconfig.json",
-                    content: '{ "compilerOptions": { } }'
-                });
-                const packageJson: File = getRootedFileOrFolder({
-                    path: "/a/b/package.json",
-                    content: `
+            function verifyNpmInstall(scenario: string, timeoutDuringPartialInstallation: boolean) {
+                it(scenario, () => {
+                    const root = "/user/username/rootfolder/otherfolder";
+                    const getRootedFileOrFolder = (fileOrFolder: File) => {
+                        fileOrFolder.path = root + fileOrFolder.path;
+                        return fileOrFolder;
+                    };
+                    const app: File = getRootedFileOrFolder({
+                        path: "/a/b/app.ts",
+                        content: "import _ from 'lodash';"
+                    });
+                    const tsconfigJson: File = getRootedFileOrFolder({
+                        path: "/a/b/tsconfig.json",
+                        content: '{ "compilerOptions": { } }'
+                    });
+                    const packageJson: File = getRootedFileOrFolder({
+                        path: "/a/b/package.json",
+                        content: `
 {
   "name": "test",
   "version": "1.0.0",
@@ -537,143 +382,115 @@ namespace ts.projectSystem {
   "license": "ISC"
 }
 `
-                });
-                const appFolder = getDirectoryPath(app.path);
-                const projectFiles = [app, libFile, tsconfigJson];
-                const typeRootDirectories = getTypeRootsFromLocation(getDirectoryPath(tsconfigJson.path));
-                const otherFiles = [packageJson];
-                const host = createServerHost(projectFiles.concat(otherFiles));
-                const projectService = createProjectService(host);
-                projectService.setHostConfiguration({ preferences: { includePackageJsonAutoImports: "off" } });
-                const { configFileName } = projectService.openClientFile(app.path);
-                assert.equal(configFileName, tsconfigJson.path as server.NormalizedPath, `should find config`); // TODO: GH#18217
-                const recursiveWatchedDirectories: string[] = [`${appFolder}`, `${appFolder}/node_modules`].concat(getNodeModuleDirectories(getDirectoryPath(appFolder)));
-                verifyProject();
-
-                let npmInstallComplete = false;
-
-                // Simulate npm install
-                const filesAndFoldersToAdd: File[] = [
-                    { path: "/a/b/node_modules" },
-                    { path: "/a/b/node_modules/.staging/@types" },
-                    { path: "/a/b/node_modules/.staging/lodash-b0733faa" },
-                    { path: "/a/b/node_modules/.staging/@types/lodash-e56c4fe7" },
-                    { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff" },
-                    { path: "/a/b/node_modules/.staging/rxjs-22375c61" },
-                    { path: "/a/b/node_modules/.staging/typescript-8493ea5d" },
-                    { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json", content: "{\n  \"name\": \"symbol-observable\",\n  \"version\": \"1.0.4\",\n  \"description\": \"Symbol.observable ponyfill\",\n  \"license\": \"MIT\",\n  \"repository\": \"blesh/symbol-observable\",\n  \"author\": {\n    \"name\": \"Ben Lesh\",\n    \"email\": \"ben@benlesh.com\"\n  },\n  \"engines\": {\n    \"node\": \">=0.10.0\"\n  },\n  \"scripts\": {\n    \"test\": \"npm run build && mocha && tsc ./ts-test/test.ts && node ./ts-test/test.js && check-es3-syntax -p lib/ --kill\",\n    \"build\": \"babel es --out-dir lib\",\n    \"prepublish\": \"npm test\"\n  },\n  \"files\": [\n    \"" },
-                    { path: "/a/b/node_modules/.staging/lodash-b0733faa/package.json", content: "{\n  \"name\": \"lodash\",\n  \"version\": \"4.17.4\",\n  \"description\": \"Lodash modular utilities.\",\n  \"keywords\": \"modules, stdlib, util\",\n  \"homepage\": \"https://lodash.com/\",\n  \"repository\": \"lodash/lodash\",\n  \"icon\": \"https://lodash.com/icon.svg\",\n  \"license\": \"MIT\",\n  \"main\": \"lodash.js\",\n  \"author\": \"John-David Dalton <john.david.dalton@gmail.com> (http://allyoucanleet.com/)\",\n  \"contributors\": [\n    \"John-David Dalton <john.david.dalton@gmail.com> (http://allyoucanleet.com/)\",\n    \"Mathias Bynens <mathias@qiwi." },
-                    { path: "/a/b/node_modules/.staging/rxjs-22375c61/package.json", content: "{\n  \"name\": \"rxjs\",\n  \"version\": \"5.4.3\",\n  \"description\": \"Reactive Extensions for modern JavaScript\",\n  \"main\": \"Rx.js\",\n  \"config\": {\n    \"commitizen\": {\n      \"path\": \"cz-conventional-changelog\"\n    }\n  },\n  \"lint-staged\": {\n    \"*.@(js)\": [\n      \"eslint --fix\",\n      \"git add\"\n    ],\n    \"*.@(ts)\": [\n      \"eslint -c .eslintrc --ext .ts . --fix\",\n      \"git add\"\n    ]\n  },\n  \"scripts-info\": {\n    \"info\": \"List available script\",\n    \"build_all\": \"Build all packages (ES6, CJS, UMD) and generate packages\",\n    \"build_cjs\": \"Build CJS package with clean up existing build, copy source into dist\",\n    \"build_es6\": \"Build ES6 package with clean up existing build, copy source into dist\",\n    \"build_closure_core\": \"Minify Global core build using closure compiler\",\n    \"build_global\": \"Build Global package, then minify build\",\n    \"build_perf\": \"Build CJS & Global build, run macro performance test\",\n    \"build_test\": \"Build CJS package & test spec, execute mocha test runner\",\n    \"build_cover\": \"Run lint to current code, build CJS & test spec, execute test coverage\",\n    \"build_docs\": \"Build ES6 & global package, create documentation using it\",\n    \"build_spec\": \"Build test specs\",\n    \"check_circular_dependencies\": \"Check codebase has circular dependencies\",\n    \"clean_spec\": \"Clean up existing test spec build output\",\n    \"clean_dist_cjs\": \"Clean up existing CJS package output\",\n    \"clean_dist_es6\": \"Clean up existing ES6 package output\",\n    \"clean_dist_global\": \"Clean up existing Global package output\",\n    \"commit\": \"Run git commit wizard\",\n    \"compile_dist_cjs\": \"Compile codebase into CJS module\",\n    \"compile_module_es6\": \"Compile codebase into ES6\",\n    \"cover\": \"Execute test coverage\",\n    \"lint_perf\": \"Run lint against performance test suite\",\n    \"lint_spec\": \"Run lint against test spec\",\n    \"lint_src\": \"Run lint against source\",\n    \"lint\": \"Run lint against everything\",\n    \"perf\": \"Run macro performance benchmark\",\n    \"perf_micro\": \"Run micro performance benchmark\",\n    \"test_mocha\": \"Execute mocha test runner against existing test spec build\",\n    \"test_browser\": \"Execute mocha test runner on browser against existing test spec build\",\n    \"test\": \"Clean up existing test spec build, build test spec and execute mocha test runner\",\n    \"tests2png\": \"Generate marble diagram image from test spec\",\n    \"watch\": \"Watch codebase, trigger compile when source code changes\"\n  },\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"git@github.com:ReactiveX/RxJS.git\"\n  },\n  \"keywords\": [\n    \"Rx\",\n    \"RxJS\",\n    \"ReactiveX\",\n    \"ReactiveExtensions\",\n    \"Streams\",\n    \"Observables\",\n    \"Observable\",\n    \"Stream\",\n    \"ES6\",\n    \"ES2015\"\n  ],\n  \"author\": \"Ben Lesh <ben@benlesh.com>\",\n  \"contributors\": [\n    {\n      \"name\": \"Ben Lesh\",\n      \"email\": \"ben@benlesh.com\"\n    },\n    {\n      \"name\": \"Paul Taylor\",\n      \"email\": \"paul.e.taylor@me.com\"\n    },\n    {\n      \"name\": \"Jeff Cross\",\n      \"email\": \"crossj@google.com\"\n    },\n    {\n      \"name\": \"Matthew Podwysocki\",\n      \"email\": \"matthewp@microsoft.com\"\n    },\n    {\n      \"name\": \"OJ Kwon\",\n      \"email\": \"kwon.ohjoong@gmail.com\"\n    },\n    {\n      \"name\": \"Andre Staltz\",\n      \"email\": \"andre@staltz.com\"\n    }\n  ],\n  \"license\": \"Apache-2.0\",\n  \"bugs\": {\n    \"url\": \"https://github.com/ReactiveX/RxJS/issues\"\n  },\n  \"homepage\": \"https://github.com/ReactiveX/RxJS\",\n  \"devDependencies\": {\n    \"babel-polyfill\": \"^6.23.0\",\n    \"benchmark\": \"^2.1.0\",\n    \"benchpress\": \"2.0.0-beta.1\",\n    \"chai\": \"^3.5.0\",\n    \"color\": \"^0.11.1\",\n    \"colors\": \"1.1.2\",\n    \"commitizen\": \"^2.8.6\",\n    \"coveralls\": \"^2.11.13\",\n    \"cz-conventional-changelog\": \"^1.2.0\",\n    \"danger\": \"^1.1.0\",\n    \"doctoc\": \"^1.0.0\",\n    \"escape-string-regexp\": \"^1.0.5 \",\n    \"esdoc\": \"^0.4.7\",\n    \"eslint\": \"^3.8.0\",\n    \"fs-extra\": \"^2.1.2\",\n    \"get-folder-size\": \"^1.0.0\",\n    \"glob\": \"^7.0.3\",\n    \"gm\": \"^1.22.0\",\n    \"google-closure-compiler-js\": \"^20170218.0.0\",\n    \"gzip-size\": \"^3.0.0\",\n    \"http-server\": \"^0.9.0\",\n    \"husky\": \"^0.13.3\",\n    \"lint-staged\": \"3.2.5\",\n    \"lodash\": \"^4.15.0\",\n    \"madge\": \"^1.4.3\",\n    \"markdown-doctest\": \"^0.9.1\",\n    \"minimist\": \"^1.2.0\",\n    \"mkdirp\": \"^0.5.1\",\n    \"mocha\": \"^3.0.2\",\n    \"mocha-in-sauce\": \"0.0.1\",\n    \"npm-run-all\": \"^4.0.2\",\n    \"npm-scripts-info\": \"^0.3.4\",\n    \"nyc\": \"^10.2.0\",\n    \"opn-cli\": \"^3.1.0\",\n    \"platform\": \"^1.3.1\",\n    \"promise\": \"^7.1.1\",\n    \"protractor\": \"^3.1.1\",\n    \"rollup\": \"0.36.3\",\n    \"rollup-plugin-inject\": \"^2.0.0\",\n    \"rollup-plugin-node-resolve\": \"^2.0.0\",\n    \"rx\": \"latest\",\n    \"rxjs\": \"latest\",\n    \"shx\": \"^0.2.2\",\n    \"sinon\": \"^2.1.0\",\n    \"sinon-chai\": \"^2.9.0\",\n    \"source-map-support\": \"^0.4.0\",\n    \"tslib\": \"^1.5.0\",\n    \"eslint\": \"^4.4.2\",\n    \"typescript\": \"~2.0.6\",\n    \"typings\": \"^2.0.0\",\n    \"validate-commit-msg\": \"^2.14.0\",\n    \"watch\": \"^1.0.1\",\n    \"webpack\": \"^1.13.1\",\n    \"xmlhttprequest\": \"1.8.0\"\n  },\n  \"engines\": {\n    \"npm\": \">=2.0.0\"\n  },\n  \"typings\": \"Rx.d.ts\",\n  \"dependencies\": {\n    \"symbol-observable\": \"^1.0.1\"\n  }\n}" },
-                    { path: "/a/b/node_modules/.staging/typescript-8493ea5d/package.json", content: "{\n    \"name\": \"typescript\",\n    \"author\": \"Microsoft Corp.\",\n    \"homepage\": \"http://typescriptlang.org/\",\n    \"version\": \"2.4.2\",\n    \"license\": \"Apache-2.0\",\n    \"description\": \"TypeScript is a language for application scale JavaScript development\",\n    \"keywords\": [\n        \"TypeScript\",\n        \"Microsoft\",\n        \"compiler\",\n        \"language\",\n        \"javascript\"\n    ],\n    \"bugs\": {\n        \"url\": \"https://github.com/Microsoft/TypeScript/issues\"\n    },\n    \"repository\": {\n        \"type\": \"git\",\n        \"url\": \"https://github.com/Microsoft/TypeScript.git\"\n    },\n    \"main\": \"./lib/typescript.js\",\n    \"typings\": \"./lib/typescript.d.ts\",\n    \"bin\": {\n        \"tsc\": \"./bin/tsc\",\n        \"tsserver\": \"./bin/tsserver\"\n    },\n    \"engines\": {\n        \"node\": \">=4.2.0\"\n    },\n    \"devDependencies\": {\n        \"@types/browserify\": \"latest\",\n        \"@types/chai\": \"latest\",\n        \"@types/convert-source-map\": \"latest\",\n        \"@types/del\": \"latest\",\n        \"@types/glob\": \"latest\",\n        \"@types/gulp\": \"latest\",\n        \"@types/gulp-concat\": \"latest\",\n        \"@types/gulp-help\": \"latest\",\n        \"@types/gulp-newer\": \"latest\",\n        \"@types/gulp-sourcemaps\": \"latest\",\n        \"@types/merge2\": \"latest\",\n        \"@types/minimatch\": \"latest\",\n        \"@types/minimist\": \"latest\",\n        \"@types/mkdirp\": \"latest\",\n        \"@types/mocha\": \"latest\",\n        \"@types/node\": \"latest\",\n        \"@types/q\": \"latest\",\n        \"@types/run-sequence\": \"latest\",\n        \"@types/through2\": \"latest\",\n        \"browserify\": \"latest\",\n        \"chai\": \"latest\",\n        \"convert-source-map\": \"latest\",\n        \"del\": \"latest\",\n        \"gulp\": \"latest\",\n        \"gulp-clone\": \"latest\",\n        \"gulp-concat\": \"latest\",\n        \"gulp-help\": \"latest\",\n        \"gulp-insert\": \"latest\",\n        \"gulp-newer\": \"latest\",\n        \"gulp-sourcemaps\": \"latest\",\n        \"gulp-typescript\": \"latest\",\n        \"into-stream\": \"latest\",\n        \"istanbul\": \"latest\",\n        \"jake\": \"latest\",\n        \"merge2\": \"latest\",\n        \"minimist\": \"latest\",\n        \"mkdirp\": \"latest\",\n        \"mocha\": \"latest\",\n        \"mocha-fivemat-progress-reporter\": \"latest\",\n        \"q\": \"latest\",\n        \"run-sequence\": \"latest\",\n        \"sorcery\": \"latest\",\n        \"through2\": \"latest\",\n        \"travis-fold\": \"latest\",\n        \"ts-node\": \"latest\",\n        \"eslint\": \"5.16.0\",\n        \"typescript\": \"^2.4\"\n    },\n    \"scripts\": {\n        \"pretest\": \"jake tests\",\n        \"test\": \"jake runtests-parallel\",\n        \"build\": \"npm run build:compiler && npm run build:tests\",\n        \"build:compiler\": \"jake local\",\n        \"build:tests\": \"jake tests\",\n        \"start\": \"node lib/tsc\",\n        \"clean\": \"jake clean\",\n        \"gulp\": \"gulp\",\n        \"jake\": \"jake\",\n        \"lint\": \"jake lint\",\n        \"setup-hooks\": \"node scripts/link-hooks.js\"\n    },\n    \"browser\": {\n        \"buffer\": false,\n        \"fs\": false,\n        \"os\": false,\n        \"path\": false\n    }\n}" },
-                    { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js", content: "module.exports = require('./lib/index');\n" },
-                    { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts", content: "declare const observableSymbol: symbol;\nexport default observableSymbol;\n" },
-                    { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib" },
-                    { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js", content: "'use strict';\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\n\nvar _ponyfill = require('./ponyfill');\n\nvar _ponyfill2 = _interopRequireDefault(_ponyfill);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }\n\nvar root; /* global window */\n\n\nif (typeof self !== 'undefined') {\n  root = self;\n} else if (typeof window !== 'undefined') {\n  root = window;\n} else if (typeof global !== 'undefined') {\n  root = global;\n} else if (typeof module !== 'undefined') {\n  root = module;\n} else {\n  root = Function('return this')();\n}\n\nvar result = (0, _ponyfill2['default'])(root);\nexports['default'] = result;" },
-                ].map(getRootedFileOrFolder);
-                verifyAfterPartialOrCompleteNpmInstall(2);
-
-                filesAndFoldersToAdd.push(...[
-                    { path: "/a/b/node_modules/.staging/typescript-8493ea5d/lib" },
-                    { path: "/a/b/node_modules/.staging/rxjs-22375c61/add/operator" },
-                    { path: "/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json", content: "{\n    \"name\": \"@types/lodash\",\n    \"version\": \"4.14.74\",\n    \"description\": \"TypeScript definitions for Lo-Dash\",\n    \"license\": \"MIT\",\n    \"contributors\": [\n        {\n            \"name\": \"Brian Zengel\",\n            \"url\": \"https://github.com/bczengel\"\n        },\n        {\n            \"name\": \"Ilya Mochalov\",\n            \"url\": \"https://github.com/chrootsu\"\n        },\n        {\n            \"name\": \"Stepan Mikhaylyuk\",\n            \"url\": \"https://github.com/stepancar\"\n        },\n        {\n            \"name\": \"Eric L Anderson\",\n            \"url\": \"https://github.com/ericanderson\"\n        },\n        {\n            \"name\": \"AJ Richardson\",\n            \"url\": \"https://github.com/aj-r\"\n        },\n        {\n            \"name\": \"Junyoung Clare Jang\",\n            \"url\": \"https://github.com/ailrun\"\n        }\n    ],\n    \"main\": \"\",\n    \"repository\": {\n        \"type\": \"git\",\n        \"url\": \"https://www.github.com/DefinitelyTyped/DefinitelyTyped.git\"\n    },\n    \"scripts\": {},\n    \"dependencies\": {},\n    \"typesPublisherContentHash\": \"12af578ffaf8d86d2df37e591857906a86b983fa9258414326544a0fe6af0de8\",\n    \"typeScriptVersion\": \"2.2\"\n}" },
-                    { path: "/a/b/node_modules/.staging/lodash-b0733faa/index.js", content: "module.exports = require('./lodash');" },
-                    { path: "/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594", content: "" }
-                ].map(getRootedFileOrFolder));
-                // Since we added/removed in .staging no timeout
-                verifyAfterPartialOrCompleteNpmInstall(0);
-
-                // Remove file "/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594"
-                host.deleteFile(last(filesAndFoldersToAdd).path);
-                filesAndFoldersToAdd.length--;
-                verifyAfterPartialOrCompleteNpmInstall(0);
-
-                filesAndFoldersToAdd.push(...[
-                    { path: "/a/b/node_modules/.staging/rxjs-22375c61/bundles" },
-                    { path: "/a/b/node_modules/.staging/rxjs-22375c61/operator" },
-                    { path: "/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom" },
-                    { path: "/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts", content: "\n// Stub for lodash\nexport = _;\nexport as namespace _;\ndeclare var _: _.LoDashStatic;\ndeclare namespace _ {\n    interface LoDashStatic {\n        someProp: string;\n    }\n    class SomeClass {\n        someMethod(): void;\n    }\n}" }
-                ].map(getRootedFileOrFolder));
-                verifyAfterPartialOrCompleteNpmInstall(0);
-
-                filesAndFoldersToAdd.push(...[
-                    { path: "/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler" },
-                    { path: "/a/b/node_modules/.staging/rxjs-22375c61/src/util" },
-                    { path: "/a/b/node_modules/.staging/rxjs-22375c61/symbol" },
-                    { path: "/a/b/node_modules/.staging/rxjs-22375c61/testing" },
-                    { path: "/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041", content: "{\n  \"_args\": [\n    [\n      {\n        \"raw\": \"rxjs@^5.4.2\",\n        \"scope\": null,\n        \"escapedName\": \"rxjs\",\n        \"name\": \"rxjs\",\n        \"rawSpec\": \"^5.4.2\",\n        \"spec\": \">=5.4.2 <6.0.0\",\n        \"type\": \"range\"\n      },\n      \"C:\\\\Users\\\\shkamat\\\\Desktop\\\\app\"\n    ]\n  ],\n  \"_from\": \"rxjs@>=5.4.2 <6.0.0\",\n  \"_id\": \"rxjs@5.4.3\",\n  \"_inCache\": true,\n  \"_location\": \"/rxjs\",\n  \"_nodeVersion\": \"7.7.2\",\n  \"_npmOperationalInternal\": {\n    \"host\": \"s3://npm-registry-packages\",\n    \"tmp\": \"tmp/rxjs-5.4.3.tgz_1502407898166_0.6800217325799167\"\n  },\n  \"_npmUser\": {\n    \"name\": \"blesh\",\n    \"email\": \"ben@benlesh.com\"\n  },\n  \"_npmVersion\": \"5.3.0\",\n  \"_phantomChildren\": {},\n  \"_requested\": {\n    \"raw\": \"rxjs@^5.4.2\",\n    \"scope\": null,\n    \"escapedName\": \"rxjs\",\n    \"name\": \"rxjs\",\n    \"rawSpec\": \"^5.4.2\",\n    \"spec\": \">=5.4.2 <6.0.0\",\n    \"type\": \"range\"\n  },\n  \"_requiredBy\": [\n    \"/\"\n  ],\n  \"_resolved\": \"https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz\",\n  \"_shasum\": \"0758cddee6033d68e0fd53676f0f3596ce3d483f\",\n  \"_shrinkwrap\": null,\n  \"_spec\": \"rxjs@^5.4.2\",\n  \"_where\": \"C:\\\\Users\\\\shkamat\\\\Desktop\\\\app\",\n  \"author\": {\n    \"name\": \"Ben Lesh\",\n    \"email\": \"ben@benlesh.com\"\n  },\n  \"bugs\": {\n    \"url\": \"https://github.com/ReactiveX/RxJS/issues\"\n  },\n  \"config\": {\n    \"commitizen\": {\n      \"path\": \"cz-conventional-changelog\"\n    }\n  },\n  \"contributors\": [\n    {\n      \"name\": \"Ben Lesh\",\n      \"email\": \"ben@benlesh.com\"\n    },\n    {\n      \"name\": \"Paul Taylor\",\n      \"email\": \"paul.e.taylor@me.com\"\n    },\n    {\n      \"name\": \"Jeff Cross\",\n      \"email\": \"crossj@google.com\"\n    },\n    {\n      \"name\": \"Matthew Podwysocki\",\n      \"email\": \"matthewp@microsoft.com\"\n    },\n    {\n      \"name\": \"OJ Kwon\",\n      \"email\": \"kwon.ohjoong@gmail.com\"\n    },\n    {\n      \"name\": \"Andre Staltz\",\n      \"email\": \"andre@staltz.com\"\n    }\n  ],\n  \"dependencies\": {\n    \"symbol-observable\": \"^1.0.1\"\n  },\n  \"description\": \"Reactive Extensions for modern JavaScript\",\n  \"devDependencies\": {\n    \"babel-polyfill\": \"^6.23.0\",\n    \"benchmark\": \"^2.1.0\",\n    \"benchpress\": \"2.0.0-beta.1\",\n    \"chai\": \"^3.5.0\",\n    \"color\": \"^0.11.1\",\n    \"colors\": \"1.1.2\",\n    \"commitizen\": \"^2.8.6\",\n    \"coveralls\": \"^2.11.13\",\n    \"cz-conventional-changelog\": \"^1.2.0\",\n    \"danger\": \"^1.1.0\",\n    \"doctoc\": \"^1.0.0\",\n    \"escape-string-regexp\": \"^1.0.5 \",\n    \"esdoc\": \"^0.4.7\",\n    \"eslint\": \"^3.8.0\",\n    \"fs-extra\": \"^2.1.2\",\n    \"get-folder-size\": \"^1.0.0\",\n    \"glob\": \"^7.0.3\",\n    \"gm\": \"^1.22.0\",\n    \"google-closure-compiler-js\": \"^20170218.0.0\",\n    \"gzip-size\": \"^3.0.0\",\n    \"http-server\": \"^0.9.0\",\n    \"husky\": \"^0.13.3\",\n    \"lint-staged\": \"3.2.5\",\n    \"lodash\": \"^4.15.0\",\n    \"madge\": \"^1.4.3\",\n    \"markdown-doctest\": \"^0.9.1\",\n    \"minimist\": \"^1.2.0\",\n    \"mkdirp\": \"^0.5.1\",\n    \"mocha\": \"^3.0.2\",\n    \"mocha-in-sauce\": \"0.0.1\",\n    \"npm-run-all\": \"^4.0.2\",\n    \"npm-scripts-info\": \"^0.3.4\",\n    \"nyc\": \"^10.2.0\",\n    \"opn-cli\": \"^3.1.0\",\n    \"platform\": \"^1.3.1\",\n    \"promise\": \"^7.1.1\",\n    \"protractor\": \"^3.1.1\",\n    \"rollup\": \"0.36.3\",\n    \"rollup-plugin-inject\": \"^2.0.0\",\n    \"rollup-plugin-node-resolve\": \"^2.0.0\",\n    \"rx\": \"latest\",\n    \"rxjs\": \"latest\",\n    \"shx\": \"^0.2.2\",\n    \"sinon\": \"^2.1.0\",\n    \"sinon-chai\": \"^2.9.0\",\n    \"source-map-support\": \"^0.4.0\",\n    \"tslib\": \"^1.5.0\",\n    \"eslint\": \"^5.16.0\",\n    \"typescript\": \"~2.0.6\",\n    \"typings\": \"^2.0.0\",\n    \"validate-commit-msg\": \"^2.14.0\",\n    \"watch\": \"^1.0.1\",\n    \"webpack\": \"^1.13.1\",\n    \"xmlhttprequest\": \"1.8.0\"\n  },\n  \"directories\": {},\n  \"dist\": {\n    \"integrity\": \"sha512-fSNi+y+P9ss+EZuV0GcIIqPUK07DEaMRUtLJvdcvMyFjc9dizuDjere+A4V7JrLGnm9iCc+nagV/4QdMTkqC4A==\",\n    \"shasum\": \"0758cddee6033d68e0fd53676f0f3596ce3d483f\",\n    \"tarball\": \"https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz\"\n  },\n  \"engines\": {\n    \"npm\": \">=2.0.0\"\n  },\n  \"homepage\": \"https://github.com/ReactiveX/RxJS\",\n  \"keywords\": [\n    \"Rx\",\n    \"RxJS\",\n    \"ReactiveX\",\n    \"ReactiveExtensions\",\n    \"Streams\",\n    \"Observables\",\n    \"Observable\",\n    \"Stream\",\n    \"ES6\",\n    \"ES2015\"\n  ],\n  \"license\": \"Apache-2.0\",\n  \"lint-staged\": {\n    \"*.@(js)\": [\n      \"eslint --fix\",\n      \"git add\"\n    ],\n    \"*.@(ts)\": [\n      \"eslint -c .eslintrc --ext .ts . --fix\",\n      \"git add\"\n    ]\n  },\n  \"main\": \"Rx.js\",\n  \"maintainers\": [\n    {\n      \"name\": \"blesh\",\n      \"email\": \"ben@benlesh.com\"\n    }\n  ],\n  \"name\": \"rxjs\",\n  \"optionalDependencies\": {},\n  \"readme\": \"ERROR: No README data found!\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"git+ssh://git@github.com/ReactiveX/RxJS.git\"\n  },\n  \"scripts-info\": {\n    \"info\": \"List available script\",\n    \"build_all\": \"Build all packages (ES6, CJS, UMD) and generate packages\",\n    \"build_cjs\": \"Build CJS package with clean up existing build, copy source into dist\",\n    \"build_es6\": \"Build ES6 package with clean up existing build, copy source into dist\",\n    \"build_closure_core\": \"Minify Global core build using closure compiler\",\n    \"build_global\": \"Build Global package, then minify build\",\n    \"build_perf\": \"Build CJS & Global build, run macro performance test\",\n    \"build_test\": \"Build CJS package & test spec, execute mocha test runner\",\n    \"build_cover\": \"Run lint to current code, build CJS & test spec, execute test coverage\",\n    \"build_docs\": \"Build ES6 & global package, create documentation using it\",\n    \"build_spec\": \"Build test specs\",\n    \"check_circular_dependencies\": \"Check codebase has circular dependencies\",\n    \"clean_spec\": \"Clean up existing test spec build output\",\n    \"clean_dist_cjs\": \"Clean up existing CJS package output\",\n    \"clean_dist_es6\": \"Clean up existing ES6 package output\",\n    \"clean_dist_global\": \"Clean up existing Global package output\",\n    \"commit\": \"Run git commit wizard\",\n    \"compile_dist_cjs\": \"Compile codebase into CJS module\",\n    \"compile_module_es6\": \"Compile codebase into ES6\",\n    \"cover\": \"Execute test coverage\",\n    \"lint_perf\": \"Run lint against performance test suite\",\n    \"lint_spec\": \"Run lint against test spec\",\n    \"lint_src\": \"Run lint against source\",\n    \"lint\": \"Run lint against everything\",\n    \"perf\": \"Run macro performance benchmark\",\n    \"perf_micro\": \"Run micro performance benchmark\",\n    \"test_mocha\": \"Execute mocha test runner against existing test spec build\",\n    \"test_browser\": \"Execute mocha test runner on browser against existing test spec build\",\n    \"test\": \"Clean up existing test spec build, build test spec and execute mocha test runner\",\n    \"tests2png\": \"Generate marble diagram image from test spec\",\n    \"watch\": \"Watch codebase, trigger compile when source code changes\"\n  },\n  \"typings\": \"Rx.d.ts\",\n  \"version\": \"5.4.3\"\n}\n" }
-                ].map(getRootedFileOrFolder));
-                verifyAfterPartialOrCompleteNpmInstall(0);
-
-                // remove /a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041
-                host.deleteFile(last(filesAndFoldersToAdd).path);
-                filesAndFoldersToAdd.length--;
-                // and add few more folders/files
-                filesAndFoldersToAdd.push(...[
-                    { path: "/a/b/node_modules/symbol-observable" },
-                    { path: "/a/b/node_modules/@types" },
-                    { path: "/a/b/node_modules/@types/lodash" },
-                    { path: "/a/b/node_modules/lodash" },
-                    { path: "/a/b/node_modules/rxjs" },
-                    { path: "/a/b/node_modules/typescript" },
-                    { path: "/a/b/node_modules/.bin" }
-                ].map(getRootedFileOrFolder));
-                // From the type root update
-                verifyAfterPartialOrCompleteNpmInstall(2);
-
-                forEach(filesAndFoldersToAdd, f => {
-                    f.path = f.path
-                        .replace("/a/b/node_modules/.staging", "/a/b/node_modules")
-                        .replace(/[\-\.][\d\w][\d\w][\d\w][\d\w][\d\w][\d\w][\d\w][\d\w]/g, "");
-                });
-
-                host.deleteFolder(root + "/a/b/node_modules/.staging", /*recursive*/ true);
-                const lodashIndexPath = root + "/a/b/node_modules/@types/lodash/index.d.ts";
-                projectFiles.push(find(filesAndFoldersToAdd, f => f.path === lodashIndexPath)!);
-                // we would now not have failed lookup in the parent of appFolder since lodash is available
-                recursiveWatchedDirectories.length = 2;
-                // npm installation complete, timeout after reload fs
-                npmInstallComplete = true;
-                verifyAfterPartialOrCompleteNpmInstall(2);
-
-                function verifyAfterPartialOrCompleteNpmInstall(timeoutQueueLengthWhenRunningTimeouts: number) {
-                    filesAndFoldersToAdd.forEach(f => host.ensureFileOrFolder(f));
-                    if (npmInstallComplete || timeoutDuringPartialInstallation) {
-                        if (timeoutQueueLengthWhenRunningTimeouts) {
-                            // Expected project update
-                            host.checkTimeoutQueueLengthAndRun(timeoutQueueLengthWhenRunningTimeouts + 1); // Scheduled invalidation of resolutions
-                            host.runQueuedTimeoutCallbacks(); // Actual update
+                    });
+                    const host = createServerHost([app, libFile, tsconfigJson, packageJson]);
+                    const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
+                    projectService.setHostConfiguration({ preferences: { includePackageJsonAutoImports: "off" } });
+                    projectService.openClientFile(app.path);
+
+                    let npmInstallComplete = false;
+
+                    // Simulate npm install
+                    const filesAndFoldersToAdd: File[] = [
+                        { path: "/a/b/node_modules" },
+                        { path: "/a/b/node_modules/.staging/@types" },
+                        { path: "/a/b/node_modules/.staging/lodash-b0733faa" },
+                        { path: "/a/b/node_modules/.staging/@types/lodash-e56c4fe7" },
+                        { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff" },
+                        { path: "/a/b/node_modules/.staging/rxjs-22375c61" },
+                        { path: "/a/b/node_modules/.staging/typescript-8493ea5d" },
+                        { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json", content: "{\n  \"name\": \"symbol-observable\",\n  \"version\": \"1.0.4\",\n  \"description\": \"Symbol.observable ponyfill\",\n  \"license\": \"MIT\",\n  \"repository\": \"blesh/symbol-observable\",\n  \"author\": {\n    \"name\": \"Ben Lesh\",\n    \"email\": \"ben@benlesh.com\"\n  },\n  \"engines\": {\n    \"node\": \">=0.10.0\"\n  },\n  \"scripts\": {\n    \"test\": \"npm run build && mocha && tsc ./ts-test/test.ts && node ./ts-test/test.js && check-es3-syntax -p lib/ --kill\",\n    \"build\": \"babel es --out-dir lib\",\n    \"prepublish\": \"npm test\"\n  },\n  \"files\": [\n    \"" },
+                        { path: "/a/b/node_modules/.staging/lodash-b0733faa/package.json", content: "{\n  \"name\": \"lodash\",\n  \"version\": \"4.17.4\",\n  \"description\": \"Lodash modular utilities.\",\n  \"keywords\": \"modules, stdlib, util\",\n  \"homepage\": \"https://lodash.com/\",\n  \"repository\": \"lodash/lodash\",\n  \"icon\": \"https://lodash.com/icon.svg\",\n  \"license\": \"MIT\",\n  \"main\": \"lodash.js\",\n  \"author\": \"John-David Dalton <john.david.dalton@gmail.com> (http://allyoucanleet.com/)\",\n  \"contributors\": [\n    \"John-David Dalton <john.david.dalton@gmail.com> (http://allyoucanleet.com/)\",\n    \"Mathias Bynens <mathias@qiwi." },
+                        { path: "/a/b/node_modules/.staging/rxjs-22375c61/package.json", content: "{\n  \"name\": \"rxjs\",\n  \"version\": \"5.4.3\",\n  \"description\": \"Reactive Extensions for modern JavaScript\",\n  \"main\": \"Rx.js\",\n  \"config\": {\n    \"commitizen\": {\n      \"path\": \"cz-conventional-changelog\"\n    }\n  },\n  \"lint-staged\": {\n    \"*.@(js)\": [\n      \"eslint --fix\",\n      \"git add\"\n    ],\n    \"*.@(ts)\": [\n      \"eslint -c .eslintrc --ext .ts . --fix\",\n      \"git add\"\n    ]\n  },\n  \"scripts-info\": {\n    \"info\": \"List available script\",\n    \"build_all\": \"Build all packages (ES6, CJS, UMD) and generate packages\",\n    \"build_cjs\": \"Build CJS package with clean up existing build, copy source into dist\",\n    \"build_es6\": \"Build ES6 package with clean up existing build, copy source into dist\",\n    \"build_closure_core\": \"Minify Global core build using closure compiler\",\n    \"build_global\": \"Build Global package, then minify build\",\n    \"build_perf\": \"Build CJS & Global build, run macro performance test\",\n    \"build_test\": \"Build CJS package & test spec, execute mocha test runner\",\n    \"build_cover\": \"Run lint to current code, build CJS & test spec, execute test coverage\",\n    \"build_docs\": \"Build ES6 & global package, create documentation using it\",\n    \"build_spec\": \"Build test specs\",\n    \"check_circular_dependencies\": \"Check codebase has circular dependencies\",\n    \"clean_spec\": \"Clean up existing test spec build output\",\n    \"clean_dist_cjs\": \"Clean up existing CJS package output\",\n    \"clean_dist_es6\": \"Clean up existing ES6 package output\",\n    \"clean_dist_global\": \"Clean up existing Global package output\",\n    \"commit\": \"Run git commit wizard\",\n    \"compile_dist_cjs\": \"Compile codebase into CJS module\",\n    \"compile_module_es6\": \"Compile codebase into ES6\",\n    \"cover\": \"Execute test coverage\",\n    \"lint_perf\": \"Run lint against performance test suite\",\n    \"lint_spec\": \"Run lint against test spec\",\n    \"lint_src\": \"Run lint against source\",\n    \"lint\": \"Run lint against everything\",\n    \"perf\": \"Run macro performance benchmark\",\n    \"perf_micro\": \"Run micro performance benchmark\",\n    \"test_mocha\": \"Execute mocha test runner against existing test spec build\",\n    \"test_browser\": \"Execute mocha test runner on browser against existing test spec build\",\n    \"test\": \"Clean up existing test spec build, build test spec and execute mocha test runner\",\n    \"tests2png\": \"Generate marble diagram image from test spec\",\n    \"watch\": \"Watch codebase, trigger compile when source code changes\"\n  },\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"git@github.com:ReactiveX/RxJS.git\"\n  },\n  \"keywords\": [\n    \"Rx\",\n    \"RxJS\",\n    \"ReactiveX\",\n    \"ReactiveExtensions\",\n    \"Streams\",\n    \"Observables\",\n    \"Observable\",\n    \"Stream\",\n    \"ES6\",\n    \"ES2015\"\n  ],\n  \"author\": \"Ben Lesh <ben@benlesh.com>\",\n  \"contributors\": [\n    {\n      \"name\": \"Ben Lesh\",\n      \"email\": \"ben@benlesh.com\"\n    },\n    {\n      \"name\": \"Paul Taylor\",\n      \"email\": \"paul.e.taylor@me.com\"\n    },\n    {\n      \"name\": \"Jeff Cross\",\n      \"email\": \"crossj@google.com\"\n    },\n    {\n      \"name\": \"Matthew Podwysocki\",\n      \"email\": \"matthewp@microsoft.com\"\n    },\n    {\n      \"name\": \"OJ Kwon\",\n      \"email\": \"kwon.ohjoong@gmail.com\"\n    },\n    {\n      \"name\": \"Andre Staltz\",\n      \"email\": \"andre@staltz.com\"\n    }\n  ],\n  \"license\": \"Apache-2.0\",\n  \"bugs\": {\n    \"url\": \"https://github.com/ReactiveX/RxJS/issues\"\n  },\n  \"homepage\": \"https://github.com/ReactiveX/RxJS\",\n  \"devDependencies\": {\n    \"babel-polyfill\": \"^6.23.0\",\n    \"benchmark\": \"^2.1.0\",\n    \"benchpress\": \"2.0.0-beta.1\",\n    \"chai\": \"^3.5.0\",\n    \"color\": \"^0.11.1\",\n    \"colors\": \"1.1.2\",\n    \"commitizen\": \"^2.8.6\",\n    \"coveralls\": \"^2.11.13\",\n    \"cz-conventional-changelog\": \"^1.2.0\",\n    \"danger\": \"^1.1.0\",\n    \"doctoc\": \"^1.0.0\",\n    \"escape-string-regexp\": \"^1.0.5 \",\n    \"esdoc\": \"^0.4.7\",\n    \"eslint\": \"^3.8.0\",\n    \"fs-extra\": \"^2.1.2\",\n    \"get-folder-size\": \"^1.0.0\",\n    \"glob\": \"^7.0.3\",\n    \"gm\": \"^1.22.0\",\n    \"google-closure-compiler-js\": \"^20170218.0.0\",\n    \"gzip-size\": \"^3.0.0\",\n    \"http-server\": \"^0.9.0\",\n    \"husky\": \"^0.13.3\",\n    \"lint-staged\": \"3.2.5\",\n    \"lodash\": \"^4.15.0\",\n    \"madge\": \"^1.4.3\",\n    \"markdown-doctest\": \"^0.9.1\",\n    \"minimist\": \"^1.2.0\",\n    \"mkdirp\": \"^0.5.1\",\n    \"mocha\": \"^3.0.2\",\n    \"mocha-in-sauce\": \"0.0.1\",\n    \"npm-run-all\": \"^4.0.2\",\n    \"npm-scripts-info\": \"^0.3.4\",\n    \"nyc\": \"^10.2.0\",\n    \"opn-cli\": \"^3.1.0\",\n    \"platform\": \"^1.3.1\",\n    \"promise\": \"^7.1.1\",\n    \"protractor\": \"^3.1.1\",\n    \"rollup\": \"0.36.3\",\n    \"rollup-plugin-inject\": \"^2.0.0\",\n    \"rollup-plugin-node-resolve\": \"^2.0.0\",\n    \"rx\": \"latest\",\n    \"rxjs\": \"latest\",\n    \"shx\": \"^0.2.2\",\n    \"sinon\": \"^2.1.0\",\n    \"sinon-chai\": \"^2.9.0\",\n    \"source-map-support\": \"^0.4.0\",\n    \"tslib\": \"^1.5.0\",\n    \"eslint\": \"^4.4.2\",\n    \"typescript\": \"~2.0.6\",\n    \"typings\": \"^2.0.0\",\n    \"validate-commit-msg\": \"^2.14.0\",\n    \"watch\": \"^1.0.1\",\n    \"webpack\": \"^1.13.1\",\n    \"xmlhttprequest\": \"1.8.0\"\n  },\n  \"engines\": {\n    \"npm\": \">=2.0.0\"\n  },\n  \"typings\": \"Rx.d.ts\",\n  \"dependencies\": {\n    \"symbol-observable\": \"^1.0.1\"\n  }\n}" },
+                        { path: "/a/b/node_modules/.staging/typescript-8493ea5d/package.json", content: "{\n    \"name\": \"typescript\",\n    \"author\": \"Microsoft Corp.\",\n    \"homepage\": \"http://typescriptlang.org/\",\n    \"version\": \"2.4.2\",\n    \"license\": \"Apache-2.0\",\n    \"description\": \"TypeScript is a language for application scale JavaScript development\",\n    \"keywords\": [\n        \"TypeScript\",\n        \"Microsoft\",\n        \"compiler\",\n        \"language\",\n        \"javascript\"\n    ],\n    \"bugs\": {\n        \"url\": \"https://github.com/Microsoft/TypeScript/issues\"\n    },\n    \"repository\": {\n        \"type\": \"git\",\n        \"url\": \"https://github.com/Microsoft/TypeScript.git\"\n    },\n    \"main\": \"./lib/typescript.js\",\n    \"typings\": \"./lib/typescript.d.ts\",\n    \"bin\": {\n        \"tsc\": \"./bin/tsc\",\n        \"tsserver\": \"./bin/tsserver\"\n    },\n    \"engines\": {\n        \"node\": \">=4.2.0\"\n    },\n    \"devDependencies\": {\n        \"@types/browserify\": \"latest\",\n        \"@types/chai\": \"latest\",\n        \"@types/convert-source-map\": \"latest\",\n        \"@types/del\": \"latest\",\n        \"@types/glob\": \"latest\",\n        \"@types/gulp\": \"latest\",\n        \"@types/gulp-concat\": \"latest\",\n        \"@types/gulp-help\": \"latest\",\n        \"@types/gulp-newer\": \"latest\",\n        \"@types/gulp-sourcemaps\": \"latest\",\n        \"@types/merge2\": \"latest\",\n        \"@types/minimatch\": \"latest\",\n        \"@types/minimist\": \"latest\",\n        \"@types/mkdirp\": \"latest\",\n        \"@types/mocha\": \"latest\",\n        \"@types/node\": \"latest\",\n        \"@types/q\": \"latest\",\n        \"@types/run-sequence\": \"latest\",\n        \"@types/through2\": \"latest\",\n        \"browserify\": \"latest\",\n        \"chai\": \"latest\",\n        \"convert-source-map\": \"latest\",\n        \"del\": \"latest\",\n        \"gulp\": \"latest\",\n        \"gulp-clone\": \"latest\",\n        \"gulp-concat\": \"latest\",\n        \"gulp-help\": \"latest\",\n        \"gulp-insert\": \"latest\",\n        \"gulp-newer\": \"latest\",\n        \"gulp-sourcemaps\": \"latest\",\n        \"gulp-typescript\": \"latest\",\n        \"into-stream\": \"latest\",\n        \"istanbul\": \"latest\",\n        \"jake\": \"latest\",\n        \"merge2\": \"latest\",\n        \"minimist\": \"latest\",\n        \"mkdirp\": \"latest\",\n        \"mocha\": \"latest\",\n        \"mocha-fivemat-progress-reporter\": \"latest\",\n        \"q\": \"latest\",\n        \"run-sequence\": \"latest\",\n        \"sorcery\": \"latest\",\n        \"through2\": \"latest\",\n        \"travis-fold\": \"latest\",\n        \"ts-node\": \"latest\",\n        \"eslint\": \"5.16.0\",\n        \"typescript\": \"^2.4\"\n    },\n    \"scripts\": {\n        \"pretest\": \"jake tests\",\n        \"test\": \"jake runtests-parallel\",\n        \"build\": \"npm run build:compiler && npm run build:tests\",\n        \"build:compiler\": \"jake local\",\n        \"build:tests\": \"jake tests\",\n        \"start\": \"node lib/tsc\",\n        \"clean\": \"jake clean\",\n        \"gulp\": \"gulp\",\n        \"jake\": \"jake\",\n        \"lint\": \"jake lint\",\n        \"setup-hooks\": \"node scripts/link-hooks.js\"\n    },\n    \"browser\": {\n        \"buffer\": false,\n        \"fs\": false,\n        \"os\": false,\n        \"path\": false\n    }\n}" },
+                        { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js", content: "module.exports = require('./lib/index');\n" },
+                        { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts", content: "declare const observableSymbol: symbol;\nexport default observableSymbol;\n" },
+                        { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib" },
+                        { path: "/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js", content: "'use strict';\n\nObject.defineProperty(exports, \"__esModule\", {\n  value: true\n});\n\nvar _ponyfill = require('./ponyfill');\n\nvar _ponyfill2 = _interopRequireDefault(_ponyfill);\n\nfunction _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }\n\nvar root; /* global window */\n\n\nif (typeof self !== 'undefined') {\n  root = self;\n} else if (typeof window !== 'undefined') {\n  root = window;\n} else if (typeof global !== 'undefined') {\n  root = global;\n} else if (typeof module !== 'undefined') {\n  root = module;\n} else {\n  root = Function('return this')();\n}\n\nvar result = (0, _ponyfill2['default'])(root);\nexports['default'] = result;" },
+                    ].map(getRootedFileOrFolder);
+                    verifyAfterPartialOrCompleteNpmInstall(2);
+
+                    filesAndFoldersToAdd.push(...[
+                        { path: "/a/b/node_modules/.staging/typescript-8493ea5d/lib" },
+                        { path: "/a/b/node_modules/.staging/rxjs-22375c61/add/operator" },
+                        { path: "/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json", content: "{\n    \"name\": \"@types/lodash\",\n    \"version\": \"4.14.74\",\n    \"description\": \"TypeScript definitions for Lo-Dash\",\n    \"license\": \"MIT\",\n    \"contributors\": [\n        {\n            \"name\": \"Brian Zengel\",\n            \"url\": \"https://github.com/bczengel\"\n        },\n        {\n            \"name\": \"Ilya Mochalov\",\n            \"url\": \"https://github.com/chrootsu\"\n        },\n        {\n            \"name\": \"Stepan Mikhaylyuk\",\n            \"url\": \"https://github.com/stepancar\"\n        },\n        {\n            \"name\": \"Eric L Anderson\",\n            \"url\": \"https://github.com/ericanderson\"\n        },\n        {\n            \"name\": \"AJ Richardson\",\n            \"url\": \"https://github.com/aj-r\"\n        },\n        {\n            \"name\": \"Junyoung Clare Jang\",\n            \"url\": \"https://github.com/ailrun\"\n        }\n    ],\n    \"main\": \"\",\n    \"repository\": {\n        \"type\": \"git\",\n        \"url\": \"https://www.github.com/DefinitelyTyped/DefinitelyTyped.git\"\n    },\n    \"scripts\": {},\n    \"dependencies\": {},\n    \"typesPublisherContentHash\": \"12af578ffaf8d86d2df37e591857906a86b983fa9258414326544a0fe6af0de8\",\n    \"typeScriptVersion\": \"2.2\"\n}" },
+                        { path: "/a/b/node_modules/.staging/lodash-b0733faa/index.js", content: "module.exports = require('./lodash');" },
+                        { path: "/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594", content: "" }
+                    ].map(getRootedFileOrFolder));
+                    // Since we added/removed in .staging no timeout
+                    verifyAfterPartialOrCompleteNpmInstall(0);
+
+                    // Remove file "/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594"
+                    host.deleteFile(last(filesAndFoldersToAdd).path);
+                    filesAndFoldersToAdd.length--;
+                    verifyAfterPartialOrCompleteNpmInstall(0);
+
+                    filesAndFoldersToAdd.push(...[
+                        { path: "/a/b/node_modules/.staging/rxjs-22375c61/bundles" },
+                        { path: "/a/b/node_modules/.staging/rxjs-22375c61/operator" },
+                        { path: "/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom" },
+                        { path: "/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts", content: "\n// Stub for lodash\nexport = _;\nexport as namespace _;\ndeclare var _: _.LoDashStatic;\ndeclare namespace _ {\n    interface LoDashStatic {\n        someProp: string;\n    }\n    class SomeClass {\n        someMethod(): void;\n    }\n}" }
+                    ].map(getRootedFileOrFolder));
+                    verifyAfterPartialOrCompleteNpmInstall(0);
+
+                    filesAndFoldersToAdd.push(...[
+                        { path: "/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler" },
+                        { path: "/a/b/node_modules/.staging/rxjs-22375c61/src/util" },
+                        { path: "/a/b/node_modules/.staging/rxjs-22375c61/symbol" },
+                        { path: "/a/b/node_modules/.staging/rxjs-22375c61/testing" },
+                        { path: "/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041", content: "{\n  \"_args\": [\n    [\n      {\n        \"raw\": \"rxjs@^5.4.2\",\n        \"scope\": null,\n        \"escapedName\": \"rxjs\",\n        \"name\": \"rxjs\",\n        \"rawSpec\": \"^5.4.2\",\n        \"spec\": \">=5.4.2 <6.0.0\",\n        \"type\": \"range\"\n      },\n      \"C:\\\\Users\\\\shkamat\\\\Desktop\\\\app\"\n    ]\n  ],\n  \"_from\": \"rxjs@>=5.4.2 <6.0.0\",\n  \"_id\": \"rxjs@5.4.3\",\n  \"_inCache\": true,\n  \"_location\": \"/rxjs\",\n  \"_nodeVersion\": \"7.7.2\",\n  \"_npmOperationalInternal\": {\n    \"host\": \"s3://npm-registry-packages\",\n    \"tmp\": \"tmp/rxjs-5.4.3.tgz_1502407898166_0.6800217325799167\"\n  },\n  \"_npmUser\": {\n    \"name\": \"blesh\",\n    \"email\": \"ben@benlesh.com\"\n  },\n  \"_npmVersion\": \"5.3.0\",\n  \"_phantomChildren\": {},\n  \"_requested\": {\n    \"raw\": \"rxjs@^5.4.2\",\n    \"scope\": null,\n    \"escapedName\": \"rxjs\",\n    \"name\": \"rxjs\",\n    \"rawSpec\": \"^5.4.2\",\n    \"spec\": \">=5.4.2 <6.0.0\",\n    \"type\": \"range\"\n  },\n  \"_requiredBy\": [\n    \"/\"\n  ],\n  \"_resolved\": \"https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz\",\n  \"_shasum\": \"0758cddee6033d68e0fd53676f0f3596ce3d483f\",\n  \"_shrinkwrap\": null,\n  \"_spec\": \"rxjs@^5.4.2\",\n  \"_where\": \"C:\\\\Users\\\\shkamat\\\\Desktop\\\\app\",\n  \"author\": {\n    \"name\": \"Ben Lesh\",\n    \"email\": \"ben@benlesh.com\"\n  },\n  \"bugs\": {\n    \"url\": \"https://github.com/ReactiveX/RxJS/issues\"\n  },\n  \"config\": {\n    \"commitizen\": {\n      \"path\": \"cz-conventional-changelog\"\n    }\n  },\n  \"contributors\": [\n    {\n      \"name\": \"Ben Lesh\",\n      \"email\": \"ben@benlesh.com\"\n    },\n    {\n      \"name\": \"Paul Taylor\",\n      \"email\": \"paul.e.taylor@me.com\"\n    },\n    {\n      \"name\": \"Jeff Cross\",\n      \"email\": \"crossj@google.com\"\n    },\n    {\n      \"name\": \"Matthew Podwysocki\",\n      \"email\": \"matthewp@microsoft.com\"\n    },\n    {\n      \"name\": \"OJ Kwon\",\n      \"email\": \"kwon.ohjoong@gmail.com\"\n    },\n    {\n      \"name\": \"Andre Staltz\",\n      \"email\": \"andre@staltz.com\"\n    }\n  ],\n  \"dependencies\": {\n    \"symbol-observable\": \"^1.0.1\"\n  },\n  \"description\": \"Reactive Extensions for modern JavaScript\",\n  \"devDependencies\": {\n    \"babel-polyfill\": \"^6.23.0\",\n    \"benchmark\": \"^2.1.0\",\n    \"benchpress\": \"2.0.0-beta.1\",\n    \"chai\": \"^3.5.0\",\n    \"color\": \"^0.11.1\",\n    \"colors\": \"1.1.2\",\n    \"commitizen\": \"^2.8.6\",\n    \"coveralls\": \"^2.11.13\",\n    \"cz-conventional-changelog\": \"^1.2.0\",\n    \"danger\": \"^1.1.0\",\n    \"doctoc\": \"^1.0.0\",\n    \"escape-string-regexp\": \"^1.0.5 \",\n    \"esdoc\": \"^0.4.7\",\n    \"eslint\": \"^3.8.0\",\n    \"fs-extra\": \"^2.1.2\",\n    \"get-folder-size\": \"^1.0.0\",\n    \"glob\": \"^7.0.3\",\n    \"gm\": \"^1.22.0\",\n    \"google-closure-compiler-js\": \"^20170218.0.0\",\n    \"gzip-size\": \"^3.0.0\",\n    \"http-server\": \"^0.9.0\",\n    \"husky\": \"^0.13.3\",\n    \"lint-staged\": \"3.2.5\",\n    \"lodash\": \"^4.15.0\",\n    \"madge\": \"^1.4.3\",\n    \"markdown-doctest\": \"^0.9.1\",\n    \"minimist\": \"^1.2.0\",\n    \"mkdirp\": \"^0.5.1\",\n    \"mocha\": \"^3.0.2\",\n    \"mocha-in-sauce\": \"0.0.1\",\n    \"npm-run-all\": \"^4.0.2\",\n    \"npm-scripts-info\": \"^0.3.4\",\n    \"nyc\": \"^10.2.0\",\n    \"opn-cli\": \"^3.1.0\",\n    \"platform\": \"^1.3.1\",\n    \"promise\": \"^7.1.1\",\n    \"protractor\": \"^3.1.1\",\n    \"rollup\": \"0.36.3\",\n    \"rollup-plugin-inject\": \"^2.0.0\",\n    \"rollup-plugin-node-resolve\": \"^2.0.0\",\n    \"rx\": \"latest\",\n    \"rxjs\": \"latest\",\n    \"shx\": \"^0.2.2\",\n    \"sinon\": \"^2.1.0\",\n    \"sinon-chai\": \"^2.9.0\",\n    \"source-map-support\": \"^0.4.0\",\n    \"tslib\": \"^1.5.0\",\n    \"eslint\": \"^5.16.0\",\n    \"typescript\": \"~2.0.6\",\n    \"typings\": \"^2.0.0\",\n    \"validate-commit-msg\": \"^2.14.0\",\n    \"watch\": \"^1.0.1\",\n    \"webpack\": \"^1.13.1\",\n    \"xmlhttprequest\": \"1.8.0\"\n  },\n  \"directories\": {},\n  \"dist\": {\n    \"integrity\": \"sha512-fSNi+y+P9ss+EZuV0GcIIqPUK07DEaMRUtLJvdcvMyFjc9dizuDjere+A4V7JrLGnm9iCc+nagV/4QdMTkqC4A==\",\n    \"shasum\": \"0758cddee6033d68e0fd53676f0f3596ce3d483f\",\n    \"tarball\": \"https://registry.npmjs.org/rxjs/-/rxjs-5.4.3.tgz\"\n  },\n  \"engines\": {\n    \"npm\": \">=2.0.0\"\n  },\n  \"homepage\": \"https://github.com/ReactiveX/RxJS\",\n  \"keywords\": [\n    \"Rx\",\n    \"RxJS\",\n    \"ReactiveX\",\n    \"ReactiveExtensions\",\n    \"Streams\",\n    \"Observables\",\n    \"Observable\",\n    \"Stream\",\n    \"ES6\",\n    \"ES2015\"\n  ],\n  \"license\": \"Apache-2.0\",\n  \"lint-staged\": {\n    \"*.@(js)\": [\n      \"eslint --fix\",\n      \"git add\"\n    ],\n    \"*.@(ts)\": [\n      \"eslint -c .eslintrc --ext .ts . --fix\",\n      \"git add\"\n    ]\n  },\n  \"main\": \"Rx.js\",\n  \"maintainers\": [\n    {\n      \"name\": \"blesh\",\n      \"email\": \"ben@benlesh.com\"\n    }\n  ],\n  \"name\": \"rxjs\",\n  \"optionalDependencies\": {},\n  \"readme\": \"ERROR: No README data found!\",\n  \"repository\": {\n    \"type\": \"git\",\n    \"url\": \"git+ssh://git@github.com/ReactiveX/RxJS.git\"\n  },\n  \"scripts-info\": {\n    \"info\": \"List available script\",\n    \"build_all\": \"Build all packages (ES6, CJS, UMD) and generate packages\",\n    \"build_cjs\": \"Build CJS package with clean up existing build, copy source into dist\",\n    \"build_es6\": \"Build ES6 package with clean up existing build, copy source into dist\",\n    \"build_closure_core\": \"Minify Global core build using closure compiler\",\n    \"build_global\": \"Build Global package, then minify build\",\n    \"build_perf\": \"Build CJS & Global build, run macro performance test\",\n    \"build_test\": \"Build CJS package & test spec, execute mocha test runner\",\n    \"build_cover\": \"Run lint to current code, build CJS & test spec, execute test coverage\",\n    \"build_docs\": \"Build ES6 & global package, create documentation using it\",\n    \"build_spec\": \"Build test specs\",\n    \"check_circular_dependencies\": \"Check codebase has circular dependencies\",\n    \"clean_spec\": \"Clean up existing test spec build output\",\n    \"clean_dist_cjs\": \"Clean up existing CJS package output\",\n    \"clean_dist_es6\": \"Clean up existing ES6 package output\",\n    \"clean_dist_global\": \"Clean up existing Global package output\",\n    \"commit\": \"Run git commit wizard\",\n    \"compile_dist_cjs\": \"Compile codebase into CJS module\",\n    \"compile_module_es6\": \"Compile codebase into ES6\",\n    \"cover\": \"Execute test coverage\",\n    \"lint_perf\": \"Run lint against performance test suite\",\n    \"lint_spec\": \"Run lint against test spec\",\n    \"lint_src\": \"Run lint against source\",\n    \"lint\": \"Run lint against everything\",\n    \"perf\": \"Run macro performance benchmark\",\n    \"perf_micro\": \"Run micro performance benchmark\",\n    \"test_mocha\": \"Execute mocha test runner against existing test spec build\",\n    \"test_browser\": \"Execute mocha test runner on browser against existing test spec build\",\n    \"test\": \"Clean up existing test spec build, build test spec and execute mocha test runner\",\n    \"tests2png\": \"Generate marble diagram image from test spec\",\n    \"watch\": \"Watch codebase, trigger compile when source code changes\"\n  },\n  \"typings\": \"Rx.d.ts\",\n  \"version\": \"5.4.3\"\n}\n" }
+                    ].map(getRootedFileOrFolder));
+                    verifyAfterPartialOrCompleteNpmInstall(0);
+
+                    // remove /a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041
+                    host.deleteFile(last(filesAndFoldersToAdd).path);
+                    filesAndFoldersToAdd.length--;
+                    // and add few more folders/files
+                    filesAndFoldersToAdd.push(...[
+                        { path: "/a/b/node_modules/symbol-observable" },
+                        { path: "/a/b/node_modules/@types" },
+                        { path: "/a/b/node_modules/@types/lodash" },
+                        { path: "/a/b/node_modules/lodash" },
+                        { path: "/a/b/node_modules/rxjs" },
+                        { path: "/a/b/node_modules/typescript" },
+                        { path: "/a/b/node_modules/.bin" }
+                    ].map(getRootedFileOrFolder));
+                    // From the type root update
+                    verifyAfterPartialOrCompleteNpmInstall(2);
+
+                    forEach(filesAndFoldersToAdd, f => {
+                        f.path = f.path
+                            .replace("/a/b/node_modules/.staging", "/a/b/node_modules")
+                            .replace(/[\-\.][\d\w][\d\w][\d\w][\d\w][\d\w][\d\w][\d\w][\d\w]/g, "");
+                    });
+
+                    host.deleteFolder(root + "/a/b/node_modules/.staging", /*recursive*/ true);
+                    // npm installation complete, timeout after reload fs
+                    npmInstallComplete = true;
+                    verifyAfterPartialOrCompleteNpmInstall(2);
+                    baselineTsserverLogs("cachingFileSystemInformation", `npm install in directory with tsconfig ${scenario}`, projectService);
+
+                    function verifyAfterPartialOrCompleteNpmInstall(timeoutQueueLengthWhenRunningTimeouts: number) {
+                        filesAndFoldersToAdd.forEach(f => host.ensureFileOrFolder(f));
+                        if (npmInstallComplete || timeoutDuringPartialInstallation) {
+                            if (timeoutQueueLengthWhenRunningTimeouts) {
+                                // Expected project update
+                                host.checkTimeoutQueueLengthAndRun(timeoutQueueLengthWhenRunningTimeouts + 1); // Scheduled invalidation of resolutions
+                                host.runQueuedTimeoutCallbacks(); // Actual update
+                            }
+                            else {
+                                host.checkTimeoutQueueLengthAndRun(timeoutQueueLengthWhenRunningTimeouts);
+                            }
                         }
                         else {
-                            host.checkTimeoutQueueLengthAndRun(timeoutQueueLengthWhenRunningTimeouts);
+                            host.checkTimeoutQueueLength(3);
                         }
                     }
-                    else {
-                        host.checkTimeoutQueueLength(3);
-                    }
-                    verifyProject();
-                }
-
-                function verifyProject() {
-                    checkNumberOfConfiguredProjects(projectService, 1);
-
-                    const project = projectService.configuredProjects.get(tsconfigJson.path)!;
-                    const projectFilePaths = map(projectFiles, f => f.path);
-                    checkProjectActualFiles(project, projectFilePaths);
-
-                    const filesWatched = filter(projectFilePaths, p => p !== app.path && p.indexOf("/a/b/node_modules") === -1);
-                    checkWatchedFiles(host, filesWatched);
-                    checkWatchedDirectories(host, typeRootDirectories.concat(recursiveWatchedDirectories), /*recursive*/ true);
-                    checkWatchedDirectories(host, [], /*recursive*/ false);
-                }
+                });
             }
 
-            it("timeouts occur inbetween installation", () => {
-                verifyNpmInstall(/*timeoutDuringPartialInstallation*/ true);
-            });
-
-            it("timeout occurs after installation", () => {
-                verifyNpmInstall(/*timeoutDuringPartialInstallation*/ false);
-            });
+            verifyNpmInstall("timeouts occur inbetween installation", /*timeoutDuringPartialInstallation*/ true);
+            verifyNpmInstall("timeout occurs after installation", /*timeoutDuringPartialInstallation*/ false);
         });
 
         it("when node_modules dont receive event for the @types file addition", () => {
diff --git a/src/testRunner/unittests/tsserver/configFileSearch.ts b/src/testRunner/unittests/tsserver/configFileSearch.ts
index 152184e9ae5d3..39ba56ced2127 100644
--- a/src/testRunner/unittests/tsserver/configFileSearch.ts
+++ b/src/testRunner/unittests/tsserver/configFileSearch.ts
@@ -38,22 +38,14 @@ namespace ts.projectSystem {
                 content: "{}"
             };
             const host = createServerHost([f1, libFile, configFile, configFile2]);
-            const service = createProjectService(host);
+            const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
             service.openClientFile(f1.path, /*fileContent*/ undefined, /*scriptKind*/ undefined, projectDir);
-            checkNumberOfProjects(service, { configuredProjects: 1 });
-            assert.isDefined(service.configuredProjects.get(configFile.path));
-            checkWatchedFiles(host, [libFile.path, configFile.path]);
-            checkWatchedDirectories(host, [], /*recursive*/ false);
-            const typeRootLocations = getTypeRootsFromLocation(configFileLocation);
-            checkWatchedDirectories(host, typeRootLocations.concat(configFileLocation), /*recursive*/ true);
 
             // Delete config file - should create inferred project and not configured project
             host.deleteFile(configFile.path);
             host.runQueuedTimeoutCallbacks();
             checkNumberOfProjects(service, { inferredProjects: 1 });
-            checkWatchedFiles(host, [libFile.path, configFile.path, `${configFileLocation}/jsconfig.json`, `${projectDir}/tsconfig.json`, `${projectDir}/jsconfig.json`]);
-            checkWatchedDirectories(host, [], /*recursive*/ false);
-            checkWatchedDirectories(host, typeRootLocations, /*recursive*/ true);
+            baselineTsserverLogs("configFileSearch", "should use projectRootPath when searching for inferred project again", service);
         });
 
         it("should use projectRootPath when searching for inferred project again 2", () => {
@@ -72,22 +64,17 @@ namespace ts.projectSystem {
                 content: "{}"
             };
             const host = createServerHost([f1, libFile, configFile, configFile2]);
-            const service = createProjectService(host, { useSingleInferredProject: true, useInferredProjectPerProjectRoot: true });
+            const service = createProjectService(host, {
+                useSingleInferredProject: true,
+                useInferredProjectPerProjectRoot: true,
+                logger: createLoggerWithInMemoryLogs(),
+            });
             service.openClientFile(f1.path, /*fileContent*/ undefined, /*scriptKind*/ undefined, projectDir);
-            checkNumberOfProjects(service, { configuredProjects: 1 });
-            assert.isDefined(service.configuredProjects.get(configFile.path));
-            checkWatchedFiles(host, [libFile.path, configFile.path]);
-            checkWatchedDirectories(host, [], /*recursive*/ false);
-            checkWatchedDirectories(host, getTypeRootsFromLocation(configFileLocation).concat(configFileLocation), /*recursive*/ true);
 
             // Delete config file - should create inferred project with project root path set
             host.deleteFile(configFile.path);
             host.runQueuedTimeoutCallbacks();
-            checkNumberOfProjects(service, { inferredProjects: 1 });
-            assert.equal(service.inferredProjects[0].projectRootPath, projectDir);
-            checkWatchedFiles(host, [libFile.path, configFile.path, `${configFileLocation}/jsconfig.json`, `${projectDir}/tsconfig.json`, `${projectDir}/jsconfig.json`]);
-            checkWatchedDirectories(host, [], /*recursive*/ false);
-            checkWatchedDirectories(host, getTypeRootsFromLocation(projectDir), /*recursive*/ true);
+            baselineTsserverLogs("configFileSearch", "should use projectRootPath when searching for inferred project again 2", service);
         });
 
         describe("when the opened file is not from project root", () => {
@@ -100,89 +87,50 @@ namespace ts.projectSystem {
                 path: `${projectRoot}/tsconfig.json`,
                 content: "{}"
             };
-            const dirOfFile = getDirectoryPath(file.path);
-
             function openClientFile(files: File[]) {
                 const host = createServerHost(files);
-                const projectService = createProjectService(host);
-
+                const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
                 projectService.openClientFile(file.path, /*fileContent*/ undefined, /*scriptKind*/ undefined, "/a/b/projects/proj");
                 return { host, projectService };
             }
 
-            function verifyConfiguredProject(host: TestServerHost, projectService: TestProjectService, orphanInferredProject?: boolean) {
-                projectService.checkNumberOfProjects({ configuredProjects: 1, inferredProjects: orphanInferredProject ? 1 : 0 });
-                const project = Debug.checkDefined(projectService.configuredProjects.get(tsconfig.path));
-
-                if (orphanInferredProject) {
-                    const inferredProject = projectService.inferredProjects[0];
-                    assert.isTrue(inferredProject.isOrphan());
-                }
-
-                checkProjectActualFiles(project, [file.path, libFile.path, tsconfig.path]);
-                checkWatchedFiles(host, [libFile.path, tsconfig.path]);
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-                checkWatchedDirectories(host, (orphanInferredProject ? [projectRoot, `${dirOfFile}/node_modules/@types`] : [projectRoot]).concat(getTypeRootsFromLocation(projectRoot)), /*recursive*/ true);
-            }
-
-            function verifyInferredProject(host: TestServerHost, projectService: TestProjectService) {
-                projectService.checkNumberOfProjects({ inferredProjects: 1 });
-                const project = projectService.inferredProjects[0];
-                assert.isDefined(project);
-
-                const filesToWatch = [libFile.path, ...getConfigFilesToWatch(dirOfFile)];
-
-                checkProjectActualFiles(project, [file.path, libFile.path]);
-                checkWatchedFiles(host, filesToWatch);
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-                checkWatchedDirectories(host, getTypeRootsFromLocation(dirOfFile), /*recursive*/ true);
-            }
-
             it("tsconfig for the file exists", () => {
                 const { host, projectService } = openClientFile([file, libFile, tsconfig]);
-                verifyConfiguredProject(host, projectService);
 
                 host.deleteFile(tsconfig.path);
                 host.runQueuedTimeoutCallbacks();
-                verifyInferredProject(host, projectService);
 
                 host.writeFile(tsconfig.path, tsconfig.content);
                 host.runQueuedTimeoutCallbacks();
-                verifyConfiguredProject(host, projectService, /*orphanInferredProject*/ true);
+
+                baselineTsserverLogs("configFileSearch", "tsconfig for the file exists", projectService);
             });
 
             it("tsconfig for the file does not exist", () => {
                 const { host, projectService } = openClientFile([file, libFile]);
-                verifyInferredProject(host, projectService);
 
                 host.writeFile(tsconfig.path, tsconfig.content);
                 host.runQueuedTimeoutCallbacks();
-                verifyConfiguredProject(host, projectService, /*orphanInferredProject*/ true);
 
                 host.deleteFile(tsconfig.path);
                 host.runQueuedTimeoutCallbacks();
-                verifyInferredProject(host, projectService);
+
+                baselineTsserverLogs("configFileSearch", "tsconfig for the file does not exist", projectService);
             });
         });
 
         describe("should not search and watch config files from directories that cannot be watched", () => {
-            const root = "/root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace";
-            function verifyConfigFileWatch(projectRootPath: string | undefined) {
-                const path = `${root}/x.js`;
-                const host = createServerHost([libFile, { path, content: "const x = 10" }], { useCaseSensitiveFileNames: true });
-                const service = createProjectService(host);
-                service.openClientFile(path, /*fileContent*/ undefined, /*scriptKind*/ undefined, projectRootPath);
-                checkNumberOfProjects(service, { inferredProjects: 1 });
-                checkProjectActualFiles(service.inferredProjects[0], [path, libFile.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, ...getConfigFilesToWatch(root)], 1);
+            function verifyConfigFileWatch(scenario: string, projectRootPath: string | undefined) {
+                it(scenario, () => {
+                    const path = `/root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js`;
+                    const host = createServerHost([libFile, { path, content: "const x = 10" }], { useCaseSensitiveFileNames: true });
+                    const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
+                    service.openClientFile(path, /*fileContent*/ undefined, /*scriptKind*/ undefined, projectRootPath);
+                    baselineTsserverLogs("configFileSearch", scenario, service);
+                });
             }
-
-            it("when projectRootPath is not present", () => {
-                verifyConfigFileWatch(/*projectRootPath*/ undefined);
-            });
-            it("when projectRootPath is present but file is not from project root", () => {
-                verifyConfigFileWatch("/a/b");
-            });
+            verifyConfigFileWatch("when projectRootPath is not present", /*projectRootPath*/ undefined);
+            verifyConfigFileWatch("when projectRootPath is present but file is not from project root", "/a/b");
         });
     });
 }
diff --git a/src/testRunner/unittests/tsserver/configuredProjects.ts b/src/testRunner/unittests/tsserver/configuredProjects.ts
index cd5bd4d81f306..d8246838c0756 100644
--- a/src/testRunner/unittests/tsserver/configuredProjects.ts
+++ b/src/testRunner/unittests/tsserver/configuredProjects.ts
@@ -25,21 +25,13 @@ namespace ts.projectSystem {
             };
 
             const host = createServerHost([configFile, libFile, file1, file2, file3]);
-            const projectService = createProjectService(host);
+            const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
             const { configFileName, configFileErrors } = projectService.openClientFile(file1.path);
 
             assert(configFileName, "should find config file");
             assert.isTrue(!configFileErrors || configFileErrors.length === 0, `expect no errors in config file, got ${JSON.stringify(configFileErrors)}`);
-            checkNumberOfInferredProjects(projectService, 0);
-            checkNumberOfConfiguredProjects(projectService, 1);
 
-            const project = configuredProjectAt(projectService, 0);
-            checkProjectActualFiles(project, [file1.path, libFile.path, file2.path, configFile.path]);
-            checkProjectRootFiles(project, [file1.path, file2.path]);
-            // watching all files except one that was open
-            checkWatchedFiles(host, [configFile.path, file2.path, libFile.path]);
-            const configFileDirectory = getDirectoryPath(configFile.path);
-            checkWatchedDirectories(host, [configFileDirectory, combinePaths(configFileDirectory, nodeModulesAtTypes)], /*recursive*/ true);
+            baselineTsserverLogs("configuredProjects", "create configured project without file list", projectService);
         });
 
         it("create configured project with the file list", () => {
@@ -65,20 +57,13 @@ namespace ts.projectSystem {
             };
 
             const host = createServerHost([configFile, libFile, file1, file2, file3]);
-            const projectService = createProjectService(host);
+            const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
             const { configFileName, configFileErrors } = projectService.openClientFile(file1.path);
 
             assert(configFileName, "should find config file");
             assert.isTrue(!configFileErrors || configFileErrors.length === 0, `expect no errors in config file, got ${JSON.stringify(configFileErrors)}`);
-            checkNumberOfInferredProjects(projectService, 0);
-            checkNumberOfConfiguredProjects(projectService, 1);
 
-            const project = configuredProjectAt(projectService, 0);
-            checkProjectActualFiles(project, [file1.path, libFile.path, file2.path, configFile.path]);
-            checkProjectRootFiles(project, [file1.path, file2.path]);
-            // watching all files except one that was open
-            checkWatchedFiles(host, [configFile.path, file2.path, libFile.path]);
-            checkWatchedDirectories(host, [getDirectoryPath(configFile.path)], /*recursive*/ false);
+            baselineTsserverLogs("configuredProjects", "create configured project with the file list", projectService);
         });
 
         it("add and then remove a config file in a folder with loose files", () => {
@@ -99,41 +84,19 @@ namespace ts.projectSystem {
 
             const host = createServerHost([libFile, commonFile1, commonFile2]);
 
-            const projectService = createProjectService(host);
+            const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
             projectService.openClientFile(commonFile1.path);
             projectService.openClientFile(commonFile2.path);
 
-            projectService.checkNumberOfProjects({ inferredProjects: 2 });
-            checkProjectActualFiles(projectService.inferredProjects[0], [commonFile1.path, libFile.path]);
-            checkProjectActualFiles(projectService.inferredProjects[1], [commonFile2.path, libFile.path]);
-
-            const watchedFiles = getConfigFilesToWatch(tscWatch.projectRoot).concat(libFile.path);
-            checkWatchedFiles(host, watchedFiles);
-
             // Add a tsconfig file
             host.writeFile(configFile.path, configFile.content);
             host.checkTimeoutQueueLengthAndRun(2); // load configured project from disk + ensureProjectsForOpenFiles
 
-            projectService.checkNumberOfProjects({ inferredProjects: 2, configuredProjects: 1 });
-            assert.isTrue(projectService.inferredProjects[0].isOrphan());
-            checkProjectActualFiles(projectService.inferredProjects[1], [commonFile2.path, libFile.path]);
-            checkProjectActualFiles(projectService.configuredProjects.get(configFile.path)!, [libFile.path, commonFile1.path, configFile.path]);
-
-            checkWatchedFiles(host, watchedFiles);
-
             // remove the tsconfig file
             host.deleteFile(configFile.path);
-
-            projectService.checkNumberOfProjects({ inferredProjects: 2 });
-            assert.isTrue(projectService.inferredProjects[0].isOrphan());
-            checkProjectActualFiles(projectService.inferredProjects[1], [commonFile2.path, libFile.path]);
-
             host.checkTimeoutQueueLengthAndRun(1); // Refresh inferred projects
 
-            projectService.checkNumberOfProjects({ inferredProjects: 2 });
-            checkProjectActualFiles(projectService.inferredProjects[0], [commonFile1.path, libFile.path]);
-            checkProjectActualFiles(projectService.inferredProjects[1], [commonFile2.path, libFile.path]);
-            checkWatchedFiles(host, watchedFiles);
+            baselineTsserverLogs("configuredProjects", "add and then remove a config file in a folder with loose files", projectService);
         });
 
         it("add new files to a configured project without file list", () => {
@@ -142,20 +105,13 @@ namespace ts.projectSystem {
                 content: `{}`
             };
             const host = createServerHost([commonFile1, libFile, configFile]);
-            const projectService = createProjectService(host);
+            const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
             projectService.openClientFile(commonFile1.path);
-            const configFileDir = getDirectoryPath(configFile.path);
-            checkWatchedDirectories(host, [configFileDir, combinePaths(configFileDir, nodeModulesAtTypes)], /*recursive*/ true);
-            checkNumberOfConfiguredProjects(projectService, 1);
-
-            const project = configuredProjectAt(projectService, 0);
-            checkProjectRootFiles(project, [commonFile1.path]);
 
             // add a new ts file
             host.writeFile(commonFile2.path, commonFile2.content);
             host.checkTimeoutQueueLengthAndRun(2);
-            // project service waits for 250ms to update the project structure, therefore the assertion needs to wait longer.
-            checkProjectRootFiles(project, [commonFile1.path, commonFile2.path]);
+            baselineTsserverLogs("configuredProjects", "add new files to a configured project without file list", projectService);
         });
 
         it("should ignore non-existing files specified in the config file", () => {
@@ -581,56 +537,37 @@ namespace ts.projectSystem {
 
             const files = [file1, file2, file3, file4];
             const host = createServerHost(files.concat(configFile));
-            const projectService = createProjectService(host);
+            const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
 
             projectService.openClientFile(file1.path);
             projectService.openClientFile(file2.path);
             projectService.openClientFile(file3.path);
             projectService.openClientFile(file4.path);
 
-            const infos = files.map(file => projectService.getScriptInfoForPath(file.path as Path)!);
-            checkOpenFiles(projectService, files);
-            checkNumberOfProjects(projectService, { configuredProjects: 1, inferredProjects: 2 });
             const configProject1 = projectService.configuredProjects.get(configFile.path)!;
             assert.isTrue(configProject1.hasOpenRef()); // file1 and file3
-            checkProjectActualFiles(configProject1, [file1.path, file3.path, configFile.path]);
-            const inferredProject1 = projectService.inferredProjects[0];
-            checkProjectActualFiles(inferredProject1, [file2.path]);
-            const inferredProject2 = projectService.inferredProjects[1];
-            checkProjectActualFiles(inferredProject2, [file4.path]);
 
             host.writeFile(configFile.path, "{}");
             host.runQueuedTimeoutCallbacks();
 
-            verifyScriptInfos();
-            checkOpenFiles(projectService, files);
-            verifyConfiguredProjectStateAfterUpdate(/*hasOpenRef*/ true, 2); // file1, file2, file3
+            assert.isTrue(configProject1.hasOpenRef()); // file1, file2, file3
             assert.isTrue(projectService.inferredProjects[0].isOrphan());
-            const inferredProject3 = projectService.inferredProjects[1];
-            checkProjectActualFiles(inferredProject3, [file4.path]);
-            assert.strictEqual(inferredProject3, inferredProject2);
 
             projectService.closeClientFile(file1.path);
             projectService.closeClientFile(file2.path);
             projectService.closeClientFile(file4.path);
 
-            verifyScriptInfos();
-            checkOpenFiles(projectService, [file3]);
-            verifyConfiguredProjectStateAfterUpdate(/*hasOpenRef*/ true, 2); // file3
+            assert.isTrue(configProject1.hasOpenRef()); // file3
             assert.isTrue(projectService.inferredProjects[0].isOrphan());
             assert.isTrue(projectService.inferredProjects[1].isOrphan());
 
             projectService.openClientFile(file4.path);
-            verifyScriptInfos();
-            checkOpenFiles(projectService, [file3, file4]);
-            verifyConfiguredProjectStateAfterUpdate(/*hasOpenRef*/ true, 1); // file3
+            assert.isTrue(configProject1.hasOpenRef()); // file3
             const inferredProject4 = projectService.inferredProjects[0];
             checkProjectActualFiles(inferredProject4, [file4.path]);
 
             projectService.closeClientFile(file3.path);
-            verifyScriptInfos();
-            checkOpenFiles(projectService, [file4]);
-            verifyConfiguredProjectStateAfterUpdate(/*hasOpenRef*/ false, 1); // No open files
+            assert.isFalse(configProject1.hasOpenRef()); // No open files
             const inferredProject5 = projectService.inferredProjects[0];
             checkProjectActualFiles(inferredProject4, [file4.path]);
             assert.strictEqual(inferredProject5, inferredProject4);
@@ -641,31 +578,8 @@ namespace ts.projectSystem {
             };
             host.writeFile(file5.path, file5.content);
             projectService.openClientFile(file5.path);
-            verifyScriptInfosAreUndefined([file1, file2, file3]);
-            assert.strictEqual(projectService.getScriptInfoForPath(file4.path as Path), find(infos, info => info.path === file4.path));
-            assert.isDefined(projectService.getScriptInfoForPath(file5.path as Path));
-            checkOpenFiles(projectService, [file4, file5]);
-            checkNumberOfProjects(projectService, { inferredProjects: 2 });
-            checkProjectActualFiles(projectService.inferredProjects[0], [file4.path]);
-            checkProjectActualFiles(projectService.inferredProjects[1], [file5.path]);
 
-            function verifyScriptInfos() {
-                infos.forEach(info => assert.strictEqual(projectService.getScriptInfoForPath(info.path), info));
-            }
-
-            function verifyScriptInfosAreUndefined(files: File[]) {
-                for (const file of files) {
-                    assert.isUndefined(projectService.getScriptInfoForPath(file.path as Path));
-                }
-            }
-
-            function verifyConfiguredProjectStateAfterUpdate(hasOpenRef: boolean, inferredProjects: number) {
-                checkNumberOfProjects(projectService, { configuredProjects: 1, inferredProjects });
-                const configProject2 = projectService.configuredProjects.get(configFile.path)!;
-                assert.strictEqual(configProject2, configProject1);
-                checkProjectActualFiles(configProject2, [file1.path, file2.path, file3.path, configFile.path]);
-                assert.equal(configProject2.hasOpenRef(), hasOpenRef);
-            }
+            baselineTsserverLogs("configuredProjects", "Open ref of configured project when open file gets added to the project as part of configured file update", projectService);
         });
 
         it("Open ref of configured project when open file gets added to the project as part of configured file update buts its open file references are all closed when the update happens", () => {
@@ -1103,35 +1017,22 @@ foo();`
                 };
 
                 const host = createServerHost([alphaExtendedConfig, aConfig, aFile, bravoExtendedConfig, bConfig, bFile, ...(additionalFiles || emptyArray)]);
-                const projectService = createProjectService(host);
+                const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
                 return { host, projectService, aFile, bFile, aConfig, bConfig, alphaExtendedConfig, bravoExtendedConfig };
             }
 
             it("should watch the extended configs of multiple projects", () => {
-                const { host, projectService, aFile, bFile, aConfig, bConfig, alphaExtendedConfig, bravoExtendedConfig } = getService();
+                const { host, projectService, aFile, bFile, bConfig, alphaExtendedConfig, bravoExtendedConfig } = getService();
 
                 projectService.openClientFile(aFile.path);
                 projectService.openClientFile(bFile.path);
-                checkNumberOfConfiguredProjects(projectService, 2);
-                const aProject = projectService.configuredProjects.get(aConfig.path)!;
-                const bProject = projectService.configuredProjects.get(bConfig.path)!;
-                checkProjectActualFiles(aProject, [aFile.path, aConfig.path, alphaExtendedConfig.path]);
-                checkProjectActualFiles(bProject, [bFile.path, bConfig.path, bravoExtendedConfig.path, alphaExtendedConfig.path]);
-                assert.isUndefined(aProject.getCompilerOptions().strict);
-                assert.isUndefined(bProject.getCompilerOptions().strict);
-                checkWatchedFiles(host, [aConfig.path, bConfig.path, libFile.path, bravoExtendedConfig.path, alphaExtendedConfig.path]);
 
                 host.writeFile(alphaExtendedConfig.path, JSON.stringify({
                     compilerOptions: {
                         strict: true
                     }
                 }));
-                assert.isTrue(projectService.hasPendingProjectUpdate(aProject));
-                assert.isTrue(projectService.hasPendingProjectUpdate(bProject));
                 host.checkTimeoutQueueLengthAndRun(3);
-                assert.isTrue(aProject.getCompilerOptions().strict);
-                assert.isTrue(bProject.getCompilerOptions().strict);
-                checkWatchedFiles(host, [aConfig.path, bConfig.path, libFile.path, bravoExtendedConfig.path, alphaExtendedConfig.path]);
 
                 host.writeFile(bravoExtendedConfig.path, JSON.stringify({
                     extends: "./alpha.tsconfig.json",
@@ -1139,30 +1040,16 @@ foo();`
                         strict: false
                     }
                 }));
-                assert.isFalse(projectService.hasPendingProjectUpdate(aProject));
-                assert.isTrue(projectService.hasPendingProjectUpdate(bProject));
                 host.checkTimeoutQueueLengthAndRun(2);
-                assert.isTrue(aProject.getCompilerOptions().strict);
-                assert.isFalse(bProject.getCompilerOptions().strict);
-                checkWatchedFiles(host, [aConfig.path, bConfig.path, libFile.path, bravoExtendedConfig.path, alphaExtendedConfig.path]);
 
                 host.writeFile(bConfig.path, JSON.stringify({
                     extends: "../extended/alpha.tsconfig.json",
                 }));
-                assert.isFalse(projectService.hasPendingProjectUpdate(aProject));
-                assert.isTrue(projectService.hasPendingProjectUpdate(bProject));
                 host.checkTimeoutQueueLengthAndRun(2);
-                assert.isTrue(aProject.getCompilerOptions().strict);
-                assert.isTrue(bProject.getCompilerOptions().strict);
-                checkWatchedFiles(host, [aConfig.path, bConfig.path, libFile.path, alphaExtendedConfig.path]);
 
                 host.writeFile(alphaExtendedConfig.path, "{}");
-                assert.isTrue(projectService.hasPendingProjectUpdate(aProject));
-                assert.isTrue(projectService.hasPendingProjectUpdate(bProject));
                 host.checkTimeoutQueueLengthAndRun(3);
-                assert.isUndefined(aProject.getCompilerOptions().strict);
-                assert.isUndefined(bProject.getCompilerOptions().strict);
-                checkWatchedFiles(host, [aConfig.path, bConfig.path, libFile.path, alphaExtendedConfig.path]);
+                baselineTsserverLogs("configuredProjects", "should watch the extended configs of multiple projects", projectService);
             });
 
             it("should stop watching the extended configs of closed projects", () => {
@@ -1174,27 +1061,21 @@ foo();`
                     path: `${tscWatch.projectRoot}/dummy/tsconfig.json`,
                     content: "{}"
                 };
-                const { host, projectService, aFile, bFile, aConfig, bConfig, alphaExtendedConfig, bravoExtendedConfig } = getService([dummy, dummyConfig]);
+                const { projectService, aFile, bFile } = getService([dummy, dummyConfig]);
 
                 projectService.openClientFile(aFile.path);
                 projectService.openClientFile(bFile.path);
                 projectService.openClientFile(dummy.path);
-                checkNumberOfConfiguredProjects(projectService, 3);
-                checkWatchedFiles(host, [aConfig.path, bConfig.path, libFile.path, bravoExtendedConfig.path, alphaExtendedConfig.path, dummyConfig.path]);
 
                 projectService.closeClientFile(bFile.path);
                 projectService.closeClientFile(dummy.path);
                 projectService.openClientFile(dummy.path);
 
-                checkNumberOfConfiguredProjects(projectService, 2);
-                checkWatchedFiles(host, [aConfig.path, libFile.path, alphaExtendedConfig.path, dummyConfig.path]);
 
                 projectService.closeClientFile(aFile.path);
                 projectService.closeClientFile(dummy.path);
                 projectService.openClientFile(dummy.path);
-
-                checkNumberOfConfiguredProjects(projectService, 1);
-                checkWatchedFiles(host, [libFile.path, dummyConfig.path]);
+                baselineTsserverLogs("configuredProjects", "should stop watching the extended configs of closed projects", projectService);
             });
         });
     });
@@ -1297,35 +1178,16 @@ foo();`
             };
             const files = [file1, file2a, configFile, libFile];
             const host = createServerHost(files);
-            const projectService = createProjectService(host);
+            const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
             projectService.openClientFile(file1.path);
-            checkNumberOfProjects(projectService, { configuredProjects: 1 });
-            const project = projectService.configuredProjects.get(configFile.path)!;
-            assert.isDefined(project);
-            checkProjectActualFiles(project, map(files, file => file.path));
-            checkWatchedFiles(host, mapDefined(files, file => file === file1 ? undefined : file.path));
-            checkWatchedDirectoriesDetailed(host, ["/a/b"], 1, /*recursive*/ false);
-            checkWatchedDirectoriesDetailed(host, ["/a/b/node_modules/@types"], 1, /*recursive*/ true);
 
-            files.push(file2);
             host.writeFile(file2.path, file2.content);
             host.runQueuedTimeoutCallbacks(); // Scheduled invalidation of resolutions
             host.runQueuedTimeoutCallbacks(); // Actual update
-            checkNumberOfProjects(projectService, { configuredProjects: 1 });
-            assert.strictEqual(projectService.configuredProjects.get(configFile.path), project);
-            checkProjectActualFiles(project, mapDefined(files, file => file === file2a ? undefined : file.path));
-            checkWatchedFiles(host, mapDefined(files, file => file === file1 ? undefined : file.path));
-            checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-            checkWatchedDirectoriesDetailed(host, ["/a/b/node_modules/@types"], 1, /*recursive*/ true);
 
             // On next file open the files file2a should be closed and not watched any more
             projectService.openClientFile(file2.path);
-            checkNumberOfProjects(projectService, { configuredProjects: 1 });
-            assert.strictEqual(projectService.configuredProjects.get(configFile.path), project);
-            checkProjectActualFiles(project, mapDefined(files, file => file === file2a ? undefined : file.path));
-            checkWatchedFiles(host, [libFile.path, configFile.path]);
-            checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-            checkWatchedDirectoriesDetailed(host, ["/a/b/node_modules/@types"], 1, /*recursive*/ true);
+            baselineTsserverLogs("configuredProjects", "changed module resolution reflected when specifying files list", projectService);
         });
 
         it("Failed lookup locations uses parent most node_modules directory", () => {
@@ -1355,17 +1217,9 @@ foo();`
             nonLibFiles.forEach(f => f.path = root + f.path);
             const files = nonLibFiles.concat(libFile);
             const host = createServerHost(files);
-            const projectService = createProjectService(host);
+            const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
             projectService.openClientFile(file1.path);
-            checkNumberOfProjects(projectService, { configuredProjects: 1 });
-            const project = projectService.configuredProjects.get(configFile.path)!;
-            assert.isDefined(project);
-            checkProjectActualFiles(project, [file1.path, libFile.path, module1.path, module2.path, configFile.path]);
-            checkWatchedFiles(host, [libFile.path, configFile.path]);
-            checkWatchedDirectories(host, [], /*recursive*/ false);
-            const watchedRecursiveDirectories = getTypeRootsFromLocation(root + "/a/b/src");
-            watchedRecursiveDirectories.push(`${root}/a/b/src/node_modules`, `${root}/a/b/node_modules`);
-            checkWatchedDirectories(host, watchedRecursiveDirectories, /*recursive*/ true);
+            baselineTsserverLogs("configuredProjects", "failed lookup locations uses parent most node_modules directory", projectService);
         });
     });
 
diff --git a/src/testRunner/unittests/tsserver/events/projectLoading.ts b/src/testRunner/unittests/tsserver/events/projectLoading.ts
index 150f7c1c724e3..53a233c8d2ac7 100644
--- a/src/testRunner/unittests/tsserver/events/projectLoading.ts
+++ b/src/testRunner/unittests/tsserver/events/projectLoading.ts
@@ -198,7 +198,7 @@ namespace ts.projectSystem {
 
         describe("when using event handler", () => {
             verifyProjectLoadingStartAndFinish(host => {
-                const { session, events } = createSessionWithEventTracking<server.ProjectLoadingStartEvent | server.ProjectLoadingFinishEvent>(host, server.ProjectLoadingStartEvent, server.ProjectLoadingFinishEvent);
+                const { session, events } = createSessionWithEventTracking<server.ProjectLoadingStartEvent | server.ProjectLoadingFinishEvent>(host, [server.ProjectLoadingStartEvent, server.ProjectLoadingFinishEvent]);
                 return {
                     session,
                     getNumberOfEvents: () => events.length,
diff --git a/src/testRunner/unittests/tsserver/events/projectUpdatedInBackground.ts b/src/testRunner/unittests/tsserver/events/projectUpdatedInBackground.ts
index 34e8f7d8e0ad8..248fd25e95ca3 100644
--- a/src/testRunner/unittests/tsserver/events/projectUpdatedInBackground.ts
+++ b/src/testRunner/unittests/tsserver/events/projectUpdatedInBackground.ts
@@ -28,7 +28,7 @@ namespace ts.projectSystem {
             verifyInitialOpen(file: File): void;
         }
 
-        function verifyProjectsUpdatedInBackgroundEvent(createSession: (host: TestServerHost) => ProjectsUpdatedInBackgroundEventVerifier) {
+        function verifyProjectsUpdatedInBackgroundEvent(scenario: string, createSession: (host: TestServerHost, logger?: Logger) => ProjectsUpdatedInBackgroundEventVerifier) {
             it("when adding new file", () => {
                 const commonFile1: File = {
                     path: "/a/b/file1.ts",
@@ -415,96 +415,70 @@ namespace ts.projectSystem {
             });
 
             describe("resolution when resolution cache size", () => {
-                function verifyWithMaxCacheLimit(useSlashRootAsSomeNotRootFolderInUserDirectory: boolean) {
-                    const rootFolder = useSlashRootAsSomeNotRootFolderInUserDirectory ? "/user/username/rootfolder/otherfolder/" : "/";
-                    const file1: File = {
-                        path: rootFolder + "a/b/project/file1.ts",
-                        content: 'import a from "file2"'
-                    };
-                    const file2: File = {
-                        path: rootFolder + "a/b/node_modules/file2.d.ts",
-                        content: "export class a { }"
-                    };
-                    const file3: File = {
-                        path: rootFolder + "a/b/project/file3.ts",
-                        content: "export class c { }"
-                    };
-                    const configFile: File = {
-                        path: rootFolder + "a/b/project/tsconfig.json",
-                        content: JSON.stringify({ compilerOptions: { typeRoots: [] } })
-                    };
-
-                    const projectFiles = [file1, file3, libFile, configFile];
-                    const openFiles = [file1.path];
-                    const watchedRecursiveDirectories = useSlashRootAsSomeNotRootFolderInUserDirectory ?
-                        // Folders of node_modules lookup not in changedRoot
-                        ["a/b/project", "a/b/project/node_modules", "a/b/node_modules", "a/node_modules", "node_modules"].map(v => rootFolder + v) :
-                        // Folder of tsconfig
-                        ["/a/b/project", "/a/b/project/node_modules"];
-                    const host = createServerHost(projectFiles);
-                    const { session, verifyInitialOpen, verifyProjectsUpdatedInBackgroundEventHandler } = createSession(host);
-                    const projectService = session.getProjectService();
-                    verifyInitialOpen(file1);
-                    checkNumberOfProjects(projectService, { configuredProjects: 1 });
-                    const project = projectService.configuredProjects.get(configFile.path)!;
-                    verifyProject();
-
-                    file3.content += "export class d {}";
-                    host.writeFile(file3.path, file3.content);
-                    host.checkTimeoutQueueLengthAndRun(2);
-
-                    // Since this is first event
-                    verifyProject();
-                    verifyProjectsUpdatedInBackgroundEventHandler([{
-                        eventName: server.ProjectsUpdatedInBackgroundEvent,
-                        data: {
-                            openFiles
-                        }
-                    }]);
+                function verifyWithMaxCacheLimit(subScenario: string, useSlashRootAsSomeNotRootFolderInUserDirectory: boolean) {
+                    it(subScenario, () => {
+                        const rootFolder = useSlashRootAsSomeNotRootFolderInUserDirectory ? "/user/username/rootfolder/otherfolder/" : "/";
+                        const file1: File = {
+                            path: rootFolder + "a/b/project/file1.ts",
+                            content: 'import a from "file2"'
+                        };
+                        const file2: File = {
+                            path: rootFolder + "a/b/node_modules/file2.d.ts",
+                            content: "export class a { }"
+                        };
+                        const file3: File = {
+                            path: rootFolder + "a/b/project/file3.ts",
+                            content: "export class c { }"
+                        };
+                        const configFile: File = {
+                            path: rootFolder + "a/b/project/tsconfig.json",
+                            content: JSON.stringify({ compilerOptions: { typeRoots: [] } })
+                        };
 
-                    projectFiles.push(file2);
-                    host.writeFile(file2.path, file2.content);
-                    host.runQueuedTimeoutCallbacks(); // For invalidation
-                    host.runQueuedTimeoutCallbacks(); // For actual update
-                    if (useSlashRootAsSomeNotRootFolderInUserDirectory) {
-                        watchedRecursiveDirectories.length = 3;
-                    }
-                    else {
-                        // file2 addition wont be detected
-                        projectFiles.pop();
-                        assert.isTrue(host.fileExists(file2.path));
-                    }
-                    verifyProject();
+                        const openFiles = [file1.path];
+                        const host = createServerHost([file1, file3, libFile, configFile]);
+                        const { session, verifyInitialOpen, verifyProjectsUpdatedInBackgroundEventHandler } = createSession(host, createLoggerWithInMemoryLogs());
+                        verifyInitialOpen(file1);
 
-                    verifyProjectsUpdatedInBackgroundEventHandler(useSlashRootAsSomeNotRootFolderInUserDirectory ? [{
-                        eventName: server.ProjectsUpdatedInBackgroundEvent,
-                        data: {
-                            openFiles
-                        }
-                    }] : []);
+                        file3.content += "export class d {}";
+                        host.writeFile(file3.path, file3.content);
+                        host.checkTimeoutQueueLengthAndRun(2);
 
-                    function verifyProject() {
-                        checkProjectActualFiles(project, map(projectFiles, file => file.path));
-                        checkWatchedDirectories(host, [], /*recursive*/ false);
-                        checkWatchedDirectories(host, watchedRecursiveDirectories, /*recursive*/ true);
-                    }
-                }
+                        // Since this is first event
+                        verifyProjectsUpdatedInBackgroundEventHandler([{
+                            eventName: server.ProjectsUpdatedInBackgroundEvent,
+                            data: {
+                                openFiles
+                            }
+                        }]);
 
-                it("project is not at root level", () => {
-                    verifyWithMaxCacheLimit(/*useSlashRootAsSomeNotRootFolderInUserDirectory*/ true);
-                });
+                        host.writeFile(file2.path, file2.content);
+                        host.runQueuedTimeoutCallbacks(); // For invalidation
+                        host.runQueuedTimeoutCallbacks(); // For actual update
 
-                it("project is at root level", () => {
-                    verifyWithMaxCacheLimit(/*useSlashRootAsSomeNotRootFolderInUserDirectory*/ false);
-                });
+                        verifyProjectsUpdatedInBackgroundEventHandler(useSlashRootAsSomeNotRootFolderInUserDirectory ? [{
+                            eventName: server.ProjectsUpdatedInBackgroundEvent,
+                            data: {
+                                openFiles
+                            }
+                        }] : []);
+                        baselineTsserverLogs("projectUpdatedInBackground", `${scenario} and ${subScenario}`, session);
+                    });
+                }
+                verifyWithMaxCacheLimit("project is not at root level", /*useSlashRootAsSomeNotRootFolderInUserDirectory*/ true);
+                verifyWithMaxCacheLimit("project is at root level", /*useSlashRootAsSomeNotRootFolderInUserDirectory*/ false);
             });
         }
 
         describe("when event handler is set in the session", () => {
-            verifyProjectsUpdatedInBackgroundEvent(createSessionWithProjectChangedEventHandler);
-
-            function createSessionWithProjectChangedEventHandler(host: TestServerHost): ProjectsUpdatedInBackgroundEventVerifier {
-                const { session, events: projectChangedEvents } = createSessionWithEventTracking<server.ProjectsUpdatedInBackgroundEvent>(host, server.ProjectsUpdatedInBackgroundEvent);
+            verifyProjectsUpdatedInBackgroundEvent("when event handler is set in the session", createSessionWithProjectChangedEventHandler);
+
+            function createSessionWithProjectChangedEventHandler(host: TestServerHost, logger: Logger | undefined): ProjectsUpdatedInBackgroundEventVerifier {
+                const { session, events: projectChangedEvents } = createSessionWithEventTracking<server.ProjectsUpdatedInBackgroundEvent>(
+                    host,
+                    server.ProjectsUpdatedInBackgroundEvent,
+                    logger && { logger }
+                );
                 return {
                     session,
                     verifyProjectsUpdatedInBackgroundEventHandler,
@@ -535,16 +509,20 @@ namespace ts.projectSystem {
 
         describe("when event handler is not set but session is created with canUseEvents = true", () => {
             describe("without noGetErrOnBackgroundUpdate, diagnostics for open files are queued", () => {
-                verifyProjectsUpdatedInBackgroundEvent(createSessionThatUsesEvents);
+                verifyProjectsUpdatedInBackgroundEvent("without noGetErrOnBackgroundUpdate", createSessionThatUsesEvents);
             });
 
             describe("with noGetErrOnBackgroundUpdate, diagnostics for open file are not queued", () => {
-                verifyProjectsUpdatedInBackgroundEvent(host => createSessionThatUsesEvents(host, /*noGetErrOnBackgroundUpdate*/ true));
+                verifyProjectsUpdatedInBackgroundEvent("with noGetErrOnBackgroundUpdate", (host, logger) => createSessionThatUsesEvents(host, logger, /*noGetErrOnBackgroundUpdate*/ true));
             });
 
 
-            function createSessionThatUsesEvents(host: TestServerHost, noGetErrOnBackgroundUpdate?: boolean): ProjectsUpdatedInBackgroundEventVerifier {
-                const { session, getEvents, clearEvents } = createSessionWithDefaultEventHandler<protocol.ProjectsUpdatedInBackgroundEvent>(host, server.ProjectsUpdatedInBackgroundEvent, { noGetErrOnBackgroundUpdate });
+            function createSessionThatUsesEvents(host: TestServerHost, logger: Logger | undefined, noGetErrOnBackgroundUpdate?: boolean): ProjectsUpdatedInBackgroundEventVerifier {
+                const { session, getEvents, clearEvents } = createSessionWithDefaultEventHandler<protocol.ProjectsUpdatedInBackgroundEvent>(
+                    host,
+                    server.ProjectsUpdatedInBackgroundEvent,
+                    { noGetErrOnBackgroundUpdate, logger: logger || createHasErrorMessageLogger() }
+                );
 
                 return {
                     session,
diff --git a/src/testRunner/unittests/tsserver/helpers.ts b/src/testRunner/unittests/tsserver/helpers.ts
index eb7c74653436a..0cf7b4c41d801 100644
--- a/src/testRunner/unittests/tsserver/helpers.ts
+++ b/src/testRunner/unittests/tsserver/helpers.ts
@@ -10,10 +10,6 @@ namespace ts.projectSystem {
     export import createServerHost = TestFSWithWatch.createServerHost;
     export import checkArray = TestFSWithWatch.checkArray;
     export import libFile = TestFSWithWatch.libFile;
-    export import checkWatchedFiles = TestFSWithWatch.checkWatchedFiles;
-    export import checkWatchedFilesDetailed = TestFSWithWatch.checkWatchedFilesDetailed;
-    export import checkWatchedDirectories = TestFSWithWatch.checkWatchedDirectories;
-    export import checkWatchedDirectoriesDetailed = TestFSWithWatch.checkWatchedDirectoriesDetailed;
 
     export import commonFile1 = tscWatch.commonFile1;
     export import commonFile2 = tscWatch.commonFile2;
@@ -103,11 +99,22 @@ namespace ts.projectSystem {
                     .replace(/\"updateGraphDurationMs\"\:\d+(?:\.\d+)?/g, `"updateGraphDurationMs":*`)
                     .replace(/\"createAutoImportProviderProgramDurationMs\"\:\d+(?:\.\d+)?/g, `"createAutoImportProviderProgramDurationMs":*`)
                     .replace(`"version":"${version}"`, `"version":"FakeVersion"`)
+                    .replace(/getCompletionData: Get current token: \d+(?:\.\d+)?/g, `getCompletionData: Get current token: *`)
+                    .replace(/getCompletionData: Is inside comment: \d+(?:\.\d+)?/g, `getCompletionData: Is inside comment: *`)
+                    .replace(/getCompletionData: Get previous token: \d+(?:\.\d+)?/g, `getCompletionData: Get previous token: *`)
+                    .replace(/getCompletionsAtPosition: isCompletionListBlocker: \d+(?:\.\d+)?/g, `getCompletionsAtPosition: isCompletionListBlocker: *`)
+                    .replace(/getCompletionData: Semantic work: \d+(?:\.\d+)?/g, `getCompletionData: Semantic work: *`)
+                    .replace(/getCompletionsAtPosition: getCompletionEntriesFromSymbols: \d+(?:\.\d+)?/g, `getCompletionsAtPosition: getCompletionEntriesFromSymbols: *`)
+                    .replace(/forEachExternalModuleToImportFrom autoImportProvider: \d+(?:\.\d+)?/g, `forEachExternalModuleToImportFrom autoImportProvider: *`)
+                    .replace(/getExportInfoMap: done in \d+(?:\.\d+)?/g, `getExportInfoMap: done in *`)
+                    .replace(/collectAutoImports: \d+(?:\.\d+)?/g, `collectAutoImports: *`)
+                    .replace(/dependencies in \d+(?:\.\d+)?/g, `dependencies in *`)
+                    .replace(/\"exportMapKey\"\:\"\w(\w|\d)*\|\d+\|/g, match => match.replace(/\|\d+\|/, `|*|`))
             )
         };
     }
 
-    export function baselineTsserverLogs(scenario: string, subScenario: string, sessionOrService: TestSession | TestProjectService) {
+    export function baselineTsserverLogs(scenario: string, subScenario: string, sessionOrService: { logger: Logger; }) {
         Debug.assert(sessionOrService.logger.logs.length); // Ensure caller used in memory logger
         Harness.Baseline.runBaseline(`tsserver/${scenario}/${subScenario.split(" ").join("-")}.js`, sessionOrService.logger.logs.join("\r\n"));
     }
@@ -379,14 +386,15 @@ namespace ts.projectSystem {
         return new TestSession({ ...sessionOptions, ...opts });
     }
 
-    export function createSessionWithEventTracking<T extends server.ProjectServiceEvent>(host: server.ServerHost, eventName: T["eventName"], ...eventNames: T["eventName"][]) {
+    export function createSessionWithEventTracking<T extends server.ProjectServiceEvent>(host: server.ServerHost, eventNames: T["eventName"] | T["eventName"][], opts: Partial<TestSessionOptions> = {}) {
         const events: T[] = [];
         const session = createSession(host, {
             eventHandler: e => {
-                if (e.eventName === eventName || eventNames.some(eventName => e.eventName === eventName)) {
+                if (isArray(eventNames) ? eventNames.some(eventName => e.eventName === eventName) : eventNames === e.eventName) {
                     events.push(e as T);
                 }
-            }
+            },
+            ...opts
         });
 
         return { session, events };
@@ -475,13 +483,6 @@ namespace ts.projectSystem {
         return iterResult.value;
     }
 
-    export function checkOrphanScriptInfos(service: server.ProjectService, expectedFiles: readonly string[]) {
-        checkArray("Orphan ScriptInfos:", arrayFrom(mapDefinedIterator(
-            service.filenameToScriptInfo.values(),
-            v => v.containingProjects.length === 0 ? v.fileName : undefined
-        )), expectedFiles);
-    }
-
     export function checkProjectActualFiles(project: server.Project, expectedFiles: readonly string[]) {
         checkArray(`${server.ProjectKind[project.projectKind]} project: ${project.getProjectName()}:: actual files`, project.getFileNames(), expectedFiles);
     }
@@ -522,14 +523,6 @@ namespace ts.projectSystem {
         ];
     }
 
-    export function checkOpenFiles(projectService: server.ProjectService, expectedFiles: File[]) {
-        checkArray("Open files", arrayFrom(projectService.openFiles.keys(), path => projectService.getScriptInfoForPath(path as Path)!.fileName), expectedFiles.map(file => file.path));
-    }
-
-    export function checkScriptInfos(projectService: server.ProjectService, expectedFiles: readonly string[], additionInfo?: string) {
-        checkArray(`ScriptInfos files: ${additionInfo || ""}`, arrayFrom(projectService.filenameToScriptInfo.values(), info => info.fileName), expectedFiles);
-    }
-
     export function protocolLocationFromSubstring(str: string, substring: string, options?: SpanFromSubstringOptions): protocol.Location {
         const start = nthIndexOf(str, substring, options ? options.index : 0);
         Debug.assert(start !== -1);
diff --git a/src/testRunner/unittests/tsserver/inferredProjects.ts b/src/testRunner/unittests/tsserver/inferredProjects.ts
index be7238323fe58..d4390e111add0 100644
--- a/src/testRunner/unittests/tsserver/inferredProjects.ts
+++ b/src/testRunner/unittests/tsserver/inferredProjects.ts
@@ -14,19 +14,9 @@ namespace ts.projectSystem {
                 content: `export let x: number`
             };
             const host = createServerHost([appFile, moduleFile, libFile]);
-            const projectService = createProjectService(host);
-            const { configFileName } = projectService.openClientFile(appFile.path);
-
-            assert(!configFileName, `should not find config, got: '${configFileName}`);
-            checkNumberOfConfiguredProjects(projectService, 0);
-            checkNumberOfInferredProjects(projectService, 1);
-
-            const project = projectService.inferredProjects[0];
-
-            checkArray("inferred project", project.getFileNames(), [appFile.path, libFile.path, moduleFile.path]);
-            checkWatchedFiles(host, getConfigFilesToWatch(tscWatch.projectRoot).concat(libFile.path, moduleFile.path));
-            checkWatchedDirectories(host, [tscWatch.projectRoot], /*recursive*/ false);
-            checkWatchedDirectories(host, [combinePaths(tscWatch.projectRoot, nodeModulesAtTypes)], /*recursive*/ true);
+            const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
+            projectService.openClientFile(appFile.path);
+            baselineTsserverLogs("inferredProjects", "create inferred project", projectService);
         });
 
         it("should use only one inferred project if 'useOneInferredProject' is set", () => {
diff --git a/src/testRunner/unittests/tsserver/moduleSpecifierCache.ts b/src/testRunner/unittests/tsserver/moduleSpecifierCache.ts
index e86cd6a694e1b..a89d9d56fdd43 100644
--- a/src/testRunner/unittests/tsserver/moduleSpecifierCache.ts
+++ b/src/testRunner/unittests/tsserver/moduleSpecifierCache.ts
@@ -59,13 +59,13 @@ namespace ts.projectSystem {
         });
 
         it("invalidates module specifiers when changes happen in contained node_modules directories", () => {
-            const { host, moduleSpecifierCache, triggerCompletions } = setup();
+            const { host, session, moduleSpecifierCache, triggerCompletions } = setup(createLoggerWithInMemoryLogs());
             // Completion at an import statement will calculate and cache module specifiers
             triggerCompletions({ file: cTs.path, line: 1, offset: cTs.content.length + 1 });
-            checkWatchedDirectories(host, ["/src", "/node_modules"], /*recursive*/ true);
             host.writeFile("/node_modules/.staging/mobx-12345678/package.json", "{}");
             host.runQueuedTimeoutCallbacks();
             assert.equal(moduleSpecifierCache.count(), 0);
+            baselineTsserverLogs("moduleSpecifierCache", "invalidates module specifiers when changes happen in contained node_modules directories", session);
         });
 
         it("does not invalidate the cache when new files are added", () => {
@@ -123,9 +123,9 @@ namespace ts.projectSystem {
         });
     });
 
-    function setup() {
+    function setup(logger?: Logger) {
         const host = createServerHost([aTs, bTs, cTs, bSymlink, ambientDeclaration, tsconfig, packageJson, mobxPackageJson, mobxDts]);
-        const session = createSession(host);
+        const session = createSession(host, logger && { logger });
         openFilesForSession([aTs, bTs, cTs], session);
         const projectService = session.getProjectService();
         const project = configuredProjectAt(projectService, 0);
diff --git a/src/testRunner/unittests/tsserver/partialSemanticServer.ts b/src/testRunner/unittests/tsserver/partialSemanticServer.ts
index 2aee331883dcf..621c4db5c5374 100644
--- a/src/testRunner/unittests/tsserver/partialSemanticServer.ts
+++ b/src/testRunner/unittests/tsserver/partialSemanticServer.ts
@@ -26,17 +26,19 @@ import { something } from "something";
                 content: "{}"
             };
             const host = createServerHost([file1, file2, file3, something, libFile, configFile]);
-            const session = createSession(host, { serverMode: LanguageServiceMode.PartialSemantic, useSingleInferredProject: true });
+            const session = createSession(host, {
+                serverMode: LanguageServiceMode.PartialSemantic,
+                useSingleInferredProject: true,
+                logger: createLoggerWithInMemoryLogs(),
+            });
             return { host, session, file1, file2, file3, something, configFile };
         }
 
         it("open files are added to inferred project even if config file is present and semantic operations succeed", () => {
-            const { host, session, file1, file2 } = setup();
+            const { session, file1, file2 } = setup();
             const service = session.getProjectService();
             openFilesForSession([file1], session);
-            checkNumberOfProjects(service, { inferredProjects: 1 });
             const project = service.inferredProjects[0];
-            checkProjectActualFiles(project, [libFile.path, file1.path]); // no imports are resolved
             verifyCompletions();
 
             openFilesForSession([file2], session);
@@ -44,39 +46,13 @@ import { something } from "something";
             checkProjectActualFiles(project, [libFile.path, file1.path, file2.path]);
             verifyCompletions();
 
+            baselineTsserverLogs("partialSemanticServer", "files are added to inferred project", session);
+
             function verifyCompletions() {
-                assert.isTrue(project.languageServiceEnabled);
-                checkWatchedFiles(host, emptyArray);
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ true);
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-                const response = session.executeCommandSeq<protocol.CompletionsRequest>({
+                session.executeCommandSeq<protocol.CompletionsRequest>({
                     command: protocol.CommandTypes.Completions,
                     arguments: protocolFileLocationFromSubstring(file1, "prop", { index: 1 })
-                }).response as protocol.CompletionEntry[];
-                assert.deepEqual(response, [
-                    completionEntry("foo", ScriptElementKind.memberFunctionElement),
-                    completionEntry("prop", ScriptElementKind.memberVariableElement),
-                ]);
-            }
-
-            function completionEntry(name: string, kind: ScriptElementKind): protocol.CompletionEntry {
-                return {
-                    name,
-                    kind,
-                    kindModifiers: "",
-                    sortText: Completions.SortText.LocationPriority,
-                    hasAction: undefined,
-                    insertText: undefined,
-                    isPackageJsonImport: undefined,
-                    isImportStatementCompletion: undefined,
-                    isRecommended: undefined,
-                    replacementSpan: undefined,
-                    source: undefined,
-                    data: undefined,
-                    sourceDisplay: undefined,
-                    isSnippet: undefined,
-                    labelDetails: undefined,
-                };
+                });
             }
         });
 
@@ -84,7 +60,6 @@ import { something } from "something";
             const { session, file1 } = setup();
             const service = session.getProjectService();
             openFilesForSession([file1], session);
-            let hasException = false;
             const request: protocol.SemanticDiagnosticsSyncRequest = {
                 type: "request",
                 seq: 1,
@@ -95,21 +70,17 @@ import { something } from "something";
                 session.executeCommand(request);
             }
             catch (e) {
-                assert.equal(e.message, `Request: semanticDiagnosticsSync not allowed in LanguageServiceMode.PartialSemantic`);
-                hasException = true;
+                session.logger.info(e.message);
             }
-            assert.isTrue(hasException);
 
-            hasException = false;
             const project = service.inferredProjects[0];
             try {
                 project.getLanguageService().getSemanticDiagnostics(file1.path);
             }
             catch (e) {
-                assert.equal(e.message, `LanguageService Operation: getSemanticDiagnostics not allowed in LanguageServiceMode.PartialSemantic`);
-                hasException = true;
+                session.logger.info(e.message);
             }
-            assert.isTrue(hasException);
+            baselineTsserverLogs("partialSemanticServer", "throws unsupported commands", session);
         });
 
         it("allows syntactic diagnostic commands", () => {
@@ -159,11 +130,8 @@ import { something } from "something";
                 content: "export const something = 10;"
             };
             host.ensureFileOrFolder(atTypes);
-            const service = session.getProjectService();
             openFilesForSession([file1], session);
-            checkNumberOfProjects(service, { inferredProjects: 1 });
-            const project = service.inferredProjects[0];
-            checkProjectActualFiles(project, [libFile.path, file1.path]); // Should not contain atTypes
+            baselineTsserverLogs("partialSemanticServer", "should not include auto type reference directives", session);
         });
 
         it("should not include referenced files from unopened files", () => {
@@ -192,30 +160,26 @@ function fooB() { }`
                 content: "{}"
             };
             const host = createServerHost([file1, file2, file3, something, libFile, configFile]);
-            const session = createSession(host, { serverMode: LanguageServiceMode.PartialSemantic, useSingleInferredProject: true });
-            const service = session.getProjectService();
+            const session = createSession(host, {
+                serverMode: LanguageServiceMode.PartialSemantic,
+                useSingleInferredProject: true,
+                logger: createLoggerWithInMemoryLogs(),
+            });
             openFilesForSession([file1], session);
-            checkNumberOfProjects(service, { inferredProjects: 1 });
-            const project = service.inferredProjects[0];
-            checkProjectActualFiles(project, [libFile.path, file1.path]); // no resolve
+            baselineTsserverLogs("partialSemanticServer", "should not include referenced files from unopened files", session);
         });
 
         it("should not crash when external module name resolution is reused", () => {
             const { session, file1, file2, file3 } = setup();
-            const service = session.getProjectService();
             openFilesForSession([file1], session);
-            checkNumberOfProjects(service, { inferredProjects: 1 });
-            const project = service.inferredProjects[0];
-            checkProjectActualFiles(project, [libFile.path, file1.path]);
 
             // Close the file that contains non relative external module name and open some file that doesnt have non relative external module import
             closeFilesForSession([file1], session);
             openFilesForSession([file3], session);
-            checkProjectActualFiles(project, [libFile.path, file3.path]);
 
             // Open file with non relative external module name
             openFilesForSession([file2], session);
-            checkProjectActualFiles(project, [libFile.path, file2.path, file3.path]);
+            baselineTsserverLogs("partialSemanticServer", "should not crash when external module name resolution is reused", session);
         });
 
         it("should not create autoImportProvider or handle package jsons", () => {
@@ -250,18 +214,13 @@ function fooB() { }`
         });
 
         it("should support go-to-definition on module specifiers", () => {
-            const { session, file1, file2 } = setup();
+            const { session, file1 } = setup();
             openFilesForSession([file1], session);
-            const response = session.executeCommandSeq<protocol.DefinitionAndBoundSpanRequest>({
+            session.executeCommandSeq<protocol.DefinitionAndBoundSpanRequest>({
                 command: protocol.CommandTypes.DefinitionAndBoundSpan,
                 arguments: protocolFileLocationFromSubstring(file1, `"./b"`)
-            }).response as protocol.DefinitionInfoAndBoundSpan;
-            assert.isDefined(response);
-            assert.deepEqual(response.definitions, [{
-                file: file2.path,
-                start: { line: 1, offset: 1 },
-                end: { line: 1, offset: 1 },
-            }]);
+            });
+            baselineTsserverLogs("partialSemanticServer", "should support go-to-definition on module specifiers", session);
         });
     });
 }
diff --git a/src/testRunner/unittests/tsserver/projectReferencesSourcemap.ts b/src/testRunner/unittests/tsserver/projectReferencesSourcemap.ts
index e49522f7dc96b..b0f2c2a15b85a 100644
--- a/src/testRunner/unittests/tsserver/projectReferencesSourcemap.ts
+++ b/src/testRunner/unittests/tsserver/projectReferencesSourcemap.ts
@@ -12,7 +12,6 @@ export function fn4() { }
 export function fn5() { }
 `
         };
-        const dependencyTsPath = dependencyTs.path.toLowerCase();
         const dependencyConfig: File = {
             path: `${dependecyLocation}/tsconfig.json`,
             content: JSON.stringify({ compilerOptions: { composite: true, declarationMap: true, declarationDir: "../decls" } })
@@ -76,210 +75,22 @@ fn5();
             );
         }
 
-        function verifyScriptInfos(session: TestSession, host: TestServerHost, openInfos: readonly string[], closedInfos: readonly string[], otherWatchedFiles: readonly string[], additionalInfo?: string) {
-            checkScriptInfos(session.getProjectService(), openInfos.concat(closedInfos), additionalInfo);
-            checkWatchedFiles(host, closedInfos.concat(otherWatchedFiles).map(f => f.toLowerCase()), additionalInfo);
-        }
-
-        function verifyOnlyRandomInfos(session: TestSession, host: TestServerHost) {
-            verifyScriptInfos(session, host, [randomFile.path], [libFile.path], [randomConfig.path], "Random");
-        }
-
-        function declarationSpan(fn: number): protocol.TextSpanWithContext {
-            return {
-                start: { line: fn, offset: 17 },
-                end: { line: fn, offset: 20 },
-                contextStart: { line: fn, offset: 1 },
-                contextEnd: { line: fn, offset: 26 }
-            };
-        }
-        function importSpan(fn: number): protocol.TextSpanWithContext {
-            return {
-                start: { line: fn + 1, offset: 5 },
-                end: { line: fn + 1, offset: 8 },
-                contextStart: { line: 1, offset: 1 },
-                contextEnd: { line: 7, offset: 22 }
-            };
-        }
-        function usageSpan(fn: number): protocol.TextSpan {
-            return { start: { line: fn + 8, offset: 1 }, end: { line: fn + 8, offset: 4 } };
-        }
-
-        function goToDefFromMainTs(fn: number): Action<protocol.DefinitionAndBoundSpanRequest, protocol.DefinitionInfoAndBoundSpan> {
-            const textSpan = usageSpan(fn);
-            const definition: protocol.FileSpan = { file: dependencyTs.path, ...declarationSpan(fn) };
-            return {
-                reqName: "goToDef",
-                request: {
-                    command: protocol.CommandTypes.DefinitionAndBoundSpan,
-                    arguments: { file: mainTs.path, ...textSpan.start }
-                },
-                expectedResponse: {
-                    // To dependency
-                    definitions: [definition],
-                    textSpan
-                }
-            };
-        }
-
-        function goToDefFromMainTsWithNoMap(fn: number): Action<protocol.DefinitionAndBoundSpanRequest, protocol.DefinitionInfoAndBoundSpan> {
-            const textSpan = usageSpan(fn);
-            const definition = declarationSpan(fn);
-            const declareSpaceLength = "declare ".length;
-            return {
-                reqName: "goToDef",
-                request: {
-                    command: protocol.CommandTypes.DefinitionAndBoundSpan,
-                    arguments: { file: mainTs.path, ...textSpan.start }
-                },
-                expectedResponse: {
-                    // To the dts
-                    definitions: [{
-                        file: dtsPath,
-                        start: { line: fn, offset: definition.start.offset + declareSpaceLength },
-                        end: { line: fn, offset: definition.end.offset + declareSpaceLength },
-                        contextStart: { line: fn, offset: 1 },
-                        contextEnd: { line: fn, offset: 37 }
-                    }],
-                    textSpan
-                }
-            };
-        }
-
-        function goToDefFromMainTsWithNoDts(fn: number): Action<protocol.DefinitionAndBoundSpanRequest, protocol.DefinitionInfoAndBoundSpan> {
-            const textSpan = usageSpan(fn);
-            return {
-                reqName: "goToDef",
-                request: {
-                    command: protocol.CommandTypes.DefinitionAndBoundSpan,
-                    arguments: { file: mainTs.path, ...textSpan.start }
-                },
-                expectedResponse: {
-                    // To import declaration
-                    definitions: [{ file: mainTs.path, ...importSpan(fn) }],
-                    textSpan
-                }
-            };
-        }
-
-        function goToDefFromMainTsWithDependencyChange(fn: number): Action<protocol.DefinitionAndBoundSpanRequest, protocol.DefinitionInfoAndBoundSpan> {
-            const textSpan = usageSpan(fn);
+        function goToDefFromMainTs(fn: number): Partial<protocol.DefinitionAndBoundSpanRequest> {
             return {
-                reqName: "goToDef",
-                request: {
-                    command: protocol.CommandTypes.DefinitionAndBoundSpan,
-                    arguments: { file: mainTs.path, ...textSpan.start }
-                },
-                expectedResponse: {
-                    // Definition on fn + 1 line
-                    definitions: [{ file: dependencyTs.path, ...declarationSpan(fn + 1) }],
-                    textSpan
-                }
+                command: protocol.CommandTypes.DefinitionAndBoundSpan,
+                arguments: { file: mainTs.path, line: fn + 8, offset: 1 }
             };
         }
 
-        function renameFromDependencyTs(fn: number): Action<protocol.RenameRequest, protocol.RenameResponseBody> {
-            const defSpan = declarationSpan(fn);
-            const { contextStart: _, contextEnd: _1, ...triggerSpan } = defSpan;
+        function renameFromDependencyTs(fn: number): Partial<protocol.RenameRequest> {
             return {
-                reqName: "rename",
-                request: {
-                    command: protocol.CommandTypes.Rename,
-                    arguments: { file: dependencyTs.path, ...triggerSpan.start }
-                },
-                expectedResponse: {
-                    info: {
-                        canRename: true,
-                        fileToRename: undefined,
-                        displayName: `fn${fn}`,
-                        fullDisplayName: `"${dependecyLocation}/FnS".fn${fn}`,
-                        kind: ScriptElementKind.functionElement,
-                        kindModifiers: "export",
-                        triggerSpan
-                    },
-                    locs: [
-                        { file: dependencyTs.path, locs: [defSpan] }
-                    ]
-                }
+                command: protocol.CommandTypes.Rename,
+                arguments: { file: dependencyTs.path, line: fn, offset: 17 }
             };
         }
 
-        function renameFromDependencyTsWithDependencyChange(fn: number): Action<protocol.RenameRequest, protocol.RenameResponseBody> {
-            const { expectedResponse: { info, locs }, ...rest } = renameFromDependencyTs(fn + 1);
-
-            return {
-                ...rest,
-                expectedResponse: {
-                    info: {
-                        ...info as protocol.RenameInfoSuccess,
-                        displayName: `fn${fn}`,
-                        fullDisplayName: `"${dependecyLocation}/FnS".fn${fn}`,
-                    },
-                    locs
-                }
-            };
-        }
-
-        function renameFromDependencyTsWithBothProjectsOpen(fn: number): Action<protocol.RenameRequest, protocol.RenameResponseBody> {
-            const { reqName, request, expectedResponse } = renameFromDependencyTs(fn);
-            const { info, locs } = expectedResponse;
-            return {
-                reqName,
-                request,
-                expectedResponse: {
-                    info,
-                    locs: [
-                        locs[0],
-                        {
-                            file: mainTs.path,
-                            locs: [
-                                importSpan(fn),
-                                usageSpan(fn)
-                            ]
-                        }
-                    ]
-                }
-            };
-        }
-
-        function renameFromDependencyTsWithBothProjectsOpenWithDependencyChange(fn: number): Action<protocol.RenameRequest, protocol.RenameResponseBody> {
-            const { reqName, request, expectedResponse, } = renameFromDependencyTsWithDependencyChange(fn);
-            const { info, locs } = expectedResponse;
-            return {
-                reqName,
-                request,
-                expectedResponse: {
-                    info,
-                    locs: [
-                        locs[0],
-                        {
-                            file: mainTs.path,
-                            locs: [
-                                importSpan(fn),
-                                usageSpan(fn)
-                            ]
-                        }
-                    ]
-                }
-            };
-        }
-
-        function removePath(array: readonly string[], ...delPaths: string[]) {
-            return array.filter(a => {
-                const aLower = a.toLowerCase();
-                return delPaths.every(dPath => dPath !== aLower);
-            });
-        }
-
-        interface Action<Req = protocol.Request, Response = unknown> {
-            reqName: string;
-            request: Partial<Req>;
-            expectedResponse: Response;
-        }
-
-        function verifyAction(session: TestSession, { reqName, request, expectedResponse }: Action) {
-            const { response } = session.executeCommandSeq(request);
-            assert.deepEqual(response, expectedResponse, `Failed Request: ${reqName}`);
+        function renameFromDependencyTsWithDependencyChange(fn: number) {
+            return renameFromDependencyTs(fn + 1);
         }
 
         function verifyDocumentPositionMapper(
@@ -313,12 +124,9 @@ fn5();
             }
         }
 
-        function verifyAllFnAction<Req = protocol.Request, Response = {}>(
+        function verifyAllFnAction<Req extends protocol.Request>(
             session: TestSession,
-            host: TestServerHost,
-            action: (fn: number) => Action<Req, Response>,
-            expectedInfos: readonly string[],
-            expectedWatchedFiles: readonly string[],
+            action: (fn: number) => Partial<Req>,
             existingDependencyMap: server.ScriptInfo | undefined,
             existingDocumentPositionMapper: server.ScriptInfo["documentPositionMapper"],
             existingMapEqual: boolean,
@@ -330,10 +138,8 @@ fn5();
             let documentPositionMapper: server.ScriptInfo["documentPositionMapper"];
             for (let fn = 1; fn <= 5; fn++) {
                 const fnAction = action(fn);
-                verifyAction(session, fnAction);
-                const debugInfo = `${fnAction.reqName}:: ${fn}`;
-                checkScriptInfos(session.getProjectService(), expectedInfos, debugInfo);
-                checkWatchedFiles(host, expectedWatchedFiles, debugInfo);
+                session.executeCommandSeq(fnAction);
+                const debugInfo = `${JSON.stringify(fnAction)}:: ${fn}`;
                 const dtsInfo = session.getProjectService().getScriptInfoForPath(dtsPath);
                 const dtsMapInfo = session.getProjectService().getScriptInfoForPath(dtsMapPath);
 
@@ -365,10 +171,7 @@ fn5();
 
         function verifyScriptInfoCollectionWith(
             session: TestSession,
-            host: TestServerHost,
             openFiles: readonly File[],
-            expectedInfos: readonly string[],
-            expectedWatchedFiles: readonly string[],
         ) {
             const { dependencyMap, documentPositionMapper } = getDocumentPositionMapper(session);
 
@@ -376,8 +179,6 @@ fn5();
             closeFilesForSession([randomFile], session);
             openFilesForSession([randomFile], session);
 
-            checkScriptInfos(session.getProjectService(), expectedInfos);
-            checkWatchedFiles(host, expectedWatchedFiles);
             // If map is not collected, document position mapper shouldnt change
             if (session.getProjectService().filenameToScriptInfo.has(dtsMapPath)) {
                 verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
@@ -386,7 +187,6 @@ fn5();
             // Closing open file, removes dependencies too
             closeFilesForSession([...openFiles, randomFile], session);
             openFilesForSession([randomFile], session);
-            verifyOnlyRandomInfos(session, host);
         }
 
         type OnHostCreate = (host: TestServerHost) => void;
@@ -416,14 +216,14 @@ fn5();
                 compilerOptions: { composite: true, declarationMap: true }
             }));
             onHostCreate?.(host);
-            const session = createSession(host);
+            const session = createSession(host, { logger: createLoggerWithInMemoryLogs() });
             return { host, session };
         }
 
         function createSessionWithProjectReferences(onHostCreate?: OnHostCreate) {
             const host = createHostWithSolutionBuild(files, [mainConfig.path]);
             onHostCreate?.(host);
-            const session = createSession(host);
+            const session = createSession(host, { logger: createLoggerWithInMemoryLogs() });
             return { host, session };
         }
 
@@ -439,7 +239,7 @@ fn5();
                 references: [{ path: "../dependency" }]
             }));
             onHostCreate?.(host);
-            const session = createSession(host);
+            const session = createSession(host, { logger: createLoggerWithInMemoryLogs() });
             return { host, session };
         }
 
@@ -449,30 +249,6 @@ fn5();
             return { dependencyMap, documentPositionMapper };
         }
 
-        function checkMainProjectWithoutProjectReferences(session: TestSession) {
-            checkProjectActualFiles(session.getProjectService().configuredProjects.get(mainConfig.path)!, [mainTs.path, libFile.path, mainConfig.path, dtsPath]);
-        }
-
-        function checkMainProjectWithoutProjectReferencesWithoutDts(session: TestSession) {
-            checkProjectActualFiles(session.getProjectService().configuredProjects.get(mainConfig.path)!, [mainTs.path, libFile.path, mainConfig.path]);
-        }
-
-        function checkMainProjectWithProjectReferences(session: TestSession) {
-            checkProjectActualFiles(session.getProjectService().configuredProjects.get(mainConfig.path)!, [mainTs.path, libFile.path, mainConfig.path, dependencyTs.path]);
-        }
-
-        function checkMainProjectWithDisabledProjectReferences(session: TestSession) {
-            checkProjectActualFiles(session.getProjectService().configuredProjects.get(mainConfig.path)!, [mainTs.path, libFile.path, mainConfig.path, dtsPath]);
-        }
-
-        function checkMainProjectWithDisabledProjectReferencesWithoutDts(session: TestSession) {
-            checkProjectActualFiles(session.getProjectService().configuredProjects.get(mainConfig.path)!, [mainTs.path, libFile.path, mainConfig.path]);
-        }
-
-        function checkDependencyProjectWith(session: TestSession) {
-            checkProjectActualFiles(session.getProjectService().configuredProjects.get(dependencyConfig.path)!, [dependencyTs.path, libFile.path, dependencyConfig.path]);
-        }
-
         function makeChangeToMainTs(session: TestSession) {
             session.executeCommandSeq<protocol.ChangeRequest>({
                 command: protocol.CommandTypes.Change,
@@ -501,22 +277,14 @@ fn5();
             });
         }
 
+
         describe("from project that uses dependency: goToDef", () => {
             function setupWithActionWith(setup: (onHostCreate?: OnHostCreate) => ReturnType<CreateSessionFn>, onHostCreate: OnHostCreate | undefined) {
                 const result = setup(onHostCreate);
-                result.session.executeCommandSeq(goToDefFromMainTs(1).request);
+                result.session.executeCommandSeq(goToDefFromMainTs(1));
                 return { ...result, ...getDocumentPositionMapper(result.session) };
             }
 
-            function verifyScriptInfoCollection(
-                session: TestSession,
-                host: TestServerHost,
-                expectedInfos: readonly string[],
-                expectedWatchedFiles: readonly string[],
-            ) {
-                return verifyScriptInfoCollectionWith(session, host, [mainTs], expectedInfos, expectedWatchedFiles);
-            }
-
             describe("when main tsconfig doesnt have project reference", () => {
                 function setup(onHostCreate?: OnHostCreate) {
                     return setupWithMainTs(createSessionWithoutProjectReferences, onHostCreate);
@@ -526,64 +294,18 @@ fn5();
                     return setupWithActionWith(setup, onHostCreate);
                 }
 
-                function checkProjects(session: TestSession) {
-                    checkNumberOfProjects(session.getProjectService(), { configuredProjects: 2 });
-                    checkMainProjectWithoutProjectReferences(session);
-                }
-
-                function checkProjectsWithoutDts(session: TestSession) {
-                    checkNumberOfProjects(session.getProjectService(), { configuredProjects: 2 });
-                    checkMainProjectWithoutProjectReferencesWithoutDts(session);
-                }
-
-                function expectedScriptInfosWhenMapped() {
-                    return [mainTs.path, randomFile.path, dependencyTs.path, libFile.path, dtsPath, dtsMapLocation];
-                }
-
-                function expectedWatchedFilesWhenMapped() {
-                    return [dependencyTsPath, libFile.path, dtsPath, dtsMapPath, mainConfig.path, randomConfig.path];
-                }
-
-                function expectedScriptInfosWhenNoMap() {
-                    // Because map is deleted, map and dependency are released
-                    return removePath(expectedScriptInfosWhenMapped(), dtsMapPath, dependencyTsPath);
-                }
-
-                function expectedWatchedFilesWhenNoMap() {
-                    // Watches deleted file
-                    return removePath(expectedWatchedFilesWhenMapped(), dependencyTsPath);
-                }
-
-                function expectedScriptInfosWhenNoDts() {
-                    // No dts, no map, no dependency
-                    return removePath(expectedScriptInfosWhenMapped(), dtsPath, dtsMapPath, dependencyTsPath);
-                }
-
-                function expectedWatchedFilesWhenNoDts() {
-                    return removePath(expectedWatchedFilesWhenMapped(), dtsPath, dtsMapPath, dependencyTsPath);
-                }
-
                 it("can go to definition correctly", () => {
-                    const { host, session } = setup();
-                    checkProjects(session);
+                    const { session } = setup();
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configHasNoReference/can go to definition correctly", session);
                 });
 
                 // Edit
@@ -594,25 +316,22 @@ fn5();
                     // change
                     makeChangeToMainTs(session);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configHasNoReference/usage file changes with timeout before request", session);
                 });
                 it(`when usage file changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
-                    const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
+                    const { session, dependencyMap, documentPositionMapper } = setupWithAction();
 
                     // change
                     makeChangeToMainTs(session);
@@ -620,15 +339,13 @@ fn5();
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configHasNoReference/usage file changes", session);
                 });
 
                 // Edit dts to add new fn
@@ -639,21 +356,18 @@ fn5();
                     // change
                     changeDtsFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configHasNoReference/dependency dts changes with timeout before request", session);
                 });
                 it(`when dependency .d.ts changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -665,15 +379,13 @@ fn5();
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configHasNoReference/dependency dts changes", session);
                 });
 
                 // Edit map file to represent added new line
@@ -684,21 +396,18 @@ fn5();
                     // change
                     changeDtsMapFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ false
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configHasNoReference/dependency dtsMap changes with timeout before request", session);
                 });
                 it(`when dependency file's map changes, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -710,39 +419,28 @@ fn5();
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ false
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configHasNoReference/dependency dtsMap changes", session);
                 });
 
                 it(`with depedency files map file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsMapLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsMapLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoMap,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
+                        goToDefFromMainTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configHasNoReference/dependency dtsMap not present", session);
                 });
                 it(`with depedency files map file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -754,22 +452,14 @@ fn5();
                     host.writeFile(dtsMapLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped()
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configHasNoReference/dependency dtsMap created", session);
                 });
                 it(`with depedency files map file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -778,49 +468,29 @@ fn5();
                     host.deleteFile(dtsMapLocation);
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoMap,
-                        // The script info for map is collected only after file open
-                        expectedScriptInfosWhenNoMap().concat(dependencyTs.path),
-                        expectedWatchedFilesWhenNoMap().concat(dependencyTsPath),
+                        goToDefFromMainTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as fileNotPresentKey
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configHasNoReference/dependency dtsMap deleted", session);
                 });
 
                 it(`with depedency .d.ts file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsLocation));
-                    checkProjectsWithoutDts(session);
+                    const { session } = setup(host => host.deleteFile(dtsLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoDts,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
+                        goToDefFromMainTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjectsWithoutDts(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configHasNoReference/dependency dts not present", session);
                 });
                 it(`with depedency .d.ts file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -832,22 +502,14 @@ fn5();
                     host.writeFile(dtsLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped()
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configHasNoReference/dependency dts created", session);
                 });
                 it(`with depedency .d.ts file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -856,25 +518,14 @@ fn5();
                     host.deleteFile(dtsLocation);
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoDts,
-                        // The script info for map is collected only after file open
-                        expectedScriptInfosWhenNoDts().concat(dependencyTs.path, dtsMapLocation),
-                        expectedWatchedFilesWhenNoDts().concat(dependencyTsPath, dtsMapPath),
+                        goToDefFromMainTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjectsWithoutDts(session);
-
-                    // Script info collection should behave as "noDts"
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configHasNoReference/dependency dts deleted", session);
                 });
             });
             describe("when main tsconfig has project reference", () => {
@@ -886,40 +537,18 @@ fn5();
                     return setupWithActionWith(setup, onHostCreate);
                 }
 
-                function checkProjects(session: TestSession) {
-                    checkNumberOfProjects(session.getProjectService(), { configuredProjects: 2 });
-                    checkMainProjectWithProjectReferences(session);
-                }
-
-                function expectedScriptInfos() {
-                    return [dependencyTs.path, libFile.path, mainTs.path, randomFile.path];
-                }
-
-                function expectedWatchedFiles() {
-                    return [dependencyTsPath, dependencyConfig.path, libFile.path, mainConfig.path, randomConfig.path];
-                }
-
                 it("can go to definition correctly", () => {
-                    const { host, session } = setup();
-                    checkProjects(session);
+                    const { session } = setup();
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/can go to definition correctly", session);
                 });
 
                 // Edit
@@ -930,25 +559,22 @@ fn5();
                     // change
                     makeChangeToMainTs(session);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/usage file changes with timeout before request", session);
                 });
                 it(`when usage file changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
-                    const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
+                    const { session, dependencyMap, documentPositionMapper } = setupWithAction();
 
                     // change
                     makeChangeToMainTs(session);
@@ -956,15 +582,13 @@ fn5();
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/usage file changes", session);
                 });
 
                 // Edit dts to add new fn
@@ -975,21 +599,18 @@ fn5();
                     // change
                     changeDtsFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/dependency dts changes with timeout before request", session);
                 });
                 it(`when dependency .d.ts changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -1001,15 +622,13 @@ fn5();
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/dependency dts changes", session);
                 });
 
                 // Edit map file to represent added new line
@@ -1020,21 +639,18 @@ fn5();
                     // change
                     changeDtsMapFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/dependency dtsMap changes with timeout before request", session);
                 });
                 it(`when dependency file's map changes, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -1046,39 +662,28 @@ fn5();
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                         /*existingMapEqual*/ true,
+                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/dependency dtsMap changes", session);
                 });
 
                 it(`with depedency files map file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsMapLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsMapLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/dependency dtsMap not present", session);
                 });
                 it(`with depedency files map file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -1090,22 +695,14 @@ fn5();
                     host.writeFile(dtsMapLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles()
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/dependency dtsMap created", session);
                 });
                 it(`with depedency files map file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -1114,48 +711,29 @@ fn5();
                     host.deleteFile(dtsMapLocation);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as fileNotPresentKey
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/dependency dtsMap deleted", session);
                 });
 
                 it(`with depedency .d.ts file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/dependency dts not present", session);
                 });
                 it(`with depedency .d.ts file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -1167,22 +745,14 @@ fn5();
                     host.writeFile(dtsLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles()
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/dependency dts created", session);
                 });
                 it(`with depedency .d.ts file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -1191,26 +761,15 @@ fn5();
                     host.deleteFile(dtsLocation);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as "noDts"
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/dependency dts deleted", session);
                 });
-
                 it(`when defining project source changes, when timeout occurs before request`, () => {
                     // Create DocumentPositionMapper
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -1220,21 +779,18 @@ fn5();
                     host.writeFile(dependencyTs.path, `function fooBar() { }
 ${dependencyTs.content}`);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithDependencyChange,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
+                        goToDefFromMainTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/dependency source changes with timeout before request", session);
                 });
                 it(`when defining project source changes, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -1248,39 +804,29 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithDependencyChange,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
+                        goToDefFromMainTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/dependency source changes", session);
                 });
 
                 it("when projects are not built", () => {
                     const host = createServerHost(files);
-                    const session = createSession(host);
+                    const session = createSession(host, { logger: createLoggerWithInMemoryLogs() });
                     openFilesForSession([mainTs, randomFile], session);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/configWithReference/when projects are not built", session);
                 });
             });
             describe("when main tsconfig has disableSourceOfProjectReferenceRedirect along with project reference", () => {
@@ -1292,64 +838,18 @@ ${dependencyTs.content}`);
                     return setupWithActionWith(setup, onHostCreate);
                 }
 
-                function checkProjects(session: TestSession) {
-                    checkNumberOfProjects(session.getProjectService(), { configuredProjects: 2 });
-                    checkMainProjectWithDisabledProjectReferences(session);
-                }
-
-                function checkProjectsWithoutDts(session: TestSession) {
-                    checkNumberOfProjects(session.getProjectService(), { configuredProjects: 2 });
-                    checkMainProjectWithDisabledProjectReferencesWithoutDts(session);
-                }
-
-                function expectedScriptInfosWhenMapped() {
-                    return [mainTs.path, randomFile.path, dependencyTs.path, libFile.path, dtsPath, dtsMapLocation];
-                }
-
-                function expectedWatchedFilesWhenMapped() {
-                    return [dependencyTsPath, libFile.path, dtsPath, dtsMapPath, mainConfig.path, randomConfig.path, dependencyConfig.path];
-                }
-
-                function expectedScriptInfosWhenNoMap() {
-                    // Because map is deleted, map and dependency are released
-                    return removePath(expectedScriptInfosWhenMapped(), dtsMapPath, dependencyTsPath);
-                }
-
-                function expectedWatchedFilesWhenNoMap() {
-                    // Watches deleted file
-                    return removePath(expectedWatchedFilesWhenMapped(), dependencyTsPath);
-                }
-
-                function expectedScriptInfosWhenNoDts() {
-                    // No dts, no map, no dependency
-                    return removePath(expectedScriptInfosWhenMapped(), dtsPath, dtsMapPath, dependencyTsPath);
-                }
-
-                function expectedWatchedFilesWhenNoDts() {
-                    return removePath(expectedWatchedFilesWhenMapped(), dtsPath, dtsMapPath, dependencyTsPath);
-                }
-
                 it("can go to definition correctly", () => {
-                    const { host, session } = setup();
-                    checkProjects(session);
+                    const { session } = setup();
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/disabledSourceRef/can go to definition correctly", session);
                 });
 
                 // Edit
@@ -1360,25 +860,22 @@ ${dependencyTs.content}`);
                     // change
                     makeChangeToMainTs(session);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/disabledSourceRef/usage file changes with timeout before request", session);
                 });
                 it(`when usage file changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
-                    const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
+                    const { session, dependencyMap, documentPositionMapper } = setupWithAction();
 
                     // change
                     makeChangeToMainTs(session);
@@ -1386,15 +883,13 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/disabledSourceRef/usage file changes", session);
                 });
 
                 // Edit dts to add new fn
@@ -1405,21 +900,18 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/disabledSourceRef/dependency dts changes with timeout before request", session);
                 });
                 it(`when dependency .d.ts changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -1431,15 +923,13 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/disabledSourceRef/dependency dts changes", session);
                 });
 
                 // Edit map file to represent added new line
@@ -1450,21 +940,18 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsMapFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/disabledSourceRef/dependency dtsMap changes with timeout before request", session);
                 });
                 it(`when dependency file's map changes, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -1476,39 +963,28 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/disabledSourceRef/dependency dtsMap changes", session);
                 });
 
                 it(`with depedency files map file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsMapLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsMapLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoMap,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
+                        goToDefFromMainTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/disabledSourceRef/dependency dtsMap not present", session);
                 });
                 it(`with depedency files map file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -1520,22 +996,14 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsMapLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped()
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/disabledSourceRef/dependency dtsMap created", session);
                 });
                 it(`with depedency files map file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -1544,49 +1012,29 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsMapLocation);
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoMap,
-                        // The script info for map is collected only after file open
-                        expectedScriptInfosWhenNoMap().concat(dependencyTs.path),
-                        expectedWatchedFilesWhenNoMap().concat(dependencyTsPath),
+                        goToDefFromMainTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as fileNotPresentKey
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/disabledSourceRef/dependency dtsMap deleted", session);
                 });
 
                 it(`with depedency .d.ts file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsLocation));
-                    checkProjectsWithoutDts(session);
+                    const { session } = setup(host => host.deleteFile(dtsLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoDts,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
+                        goToDefFromMainTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjectsWithoutDts(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/disabledSourceRef/dependency dts not present", session);
                 });
                 it(`with depedency .d.ts file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -1598,22 +1046,14 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped()
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/disabledSourceRef/dependency dts created", session);
                 });
                 it(`with depedency .d.ts file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -1622,25 +1062,14 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsLocation);
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoDts,
-                        // The script info for map is collected only after file open
-                        expectedScriptInfosWhenNoDts().concat(dependencyTs.path, dtsMapLocation),
-                        expectedWatchedFilesWhenNoDts().concat(dependencyTsPath, dtsMapPath),
+                        goToDefFromMainTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjectsWithoutDts(session);
-
-                    // Script info collection should behave as "noDts"
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "usageProject/disabledSourceRef/dependency dts deleted", session);
                 });
             });
         });
@@ -1648,52 +1077,10 @@ ${dependencyTs.content}`);
         describe("from defining project: rename", () => {
             function setupWithActionWith(setup: (onHostCreate?: OnHostCreate) => ReturnType<CreateSessionFn>, onHostCreate: OnHostCreate | undefined) {
                 const result = setup(onHostCreate);
-                result.session.executeCommandSeq(renameFromDependencyTs(1).request);
+                result.session.executeCommandSeq(renameFromDependencyTs(1));
                 return { ...result, ...getDocumentPositionMapper(result.session) };
             }
 
-            function verifyScriptInfoCollection(
-                session: TestSession,
-                host: TestServerHost,
-                expectedInfos: readonly string[],
-                expectedWatchedFiles: readonly string[],
-            ) {
-                return verifyScriptInfoCollectionWith(session, host, [dependencyTs], expectedInfos, expectedWatchedFiles);
-            }
-
-            function checkProjects(session: TestSession) {
-                checkNumberOfProjects(session.getProjectService(), { configuredProjects: 2 });
-                checkDependencyProjectWith(session);
-            }
-
-            function expectedScriptInfos() {
-                return [libFile.path, dtsLocation, dtsMapLocation, dependencyTs.path, randomFile.path];
-            }
-
-            function expectedWatchedFiles() {
-                return [libFile.path, dtsPath, dtsMapPath, dependencyConfig.path, randomConfig.path];
-            }
-
-            function expectedScriptInfosWhenNoMap() {
-                // No map
-                return removePath(expectedScriptInfos(), dtsMapPath);
-            }
-
-            function expectedWatchedFilesWhenNoMap() {
-                // Watches deleted file = map file
-                return expectedWatchedFiles();
-            }
-
-            function expectedScriptInfosWhenNoDts() {
-                // no dts or map since dts itself doesnt exist
-                return removePath(expectedScriptInfos(), dtsPath, dtsMapPath);
-            }
-
-            function expectedWatchedFilesWhenNoDts() {
-                // watch deleted file
-                return removePath(expectedWatchedFiles(), dtsMapPath);
-            }
-
             describe("when main tsconfig doesnt have project reference", () => {
                 function setup(onHostCreate?: OnHostCreate) {
                     return setupWithDependencyTs(createSessionWithoutProjectReferences, onHostCreate);
@@ -1704,26 +1091,17 @@ ${dependencyTs.content}`);
                 }
 
                 it("rename locations from dependency", () => {
-                    const { host, session } = setup();
-                    checkProjects(session);
+                    const { session } = setup();
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configHasNoReference/rename locations", session);
                 });
 
                 // Edit
@@ -1734,25 +1112,22 @@ ${dependencyTs.content}`);
                     // change
                     makeChangeToDependencyTs(session);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configHasNoReference/usage file changes with timeout before request", session);
                 });
                 it(`when usage file changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
-                    const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
+                    const { session, dependencyMap, documentPositionMapper } = setupWithAction();
 
                     // change
                     makeChangeToDependencyTs(session);
@@ -1760,15 +1135,13 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configHasNoReference/usage file changes", session);
                 });
 
                 // Edit dts to add new fn
@@ -1779,21 +1152,18 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configHasNoReference/dependency dts changes with timeout before request", session);
                 });
                 it(`when dependency .d.ts changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -1805,15 +1175,13 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configHasNoReference/dependency dts changes", session);
                 });
 
                 // Edit map file to represent added new line
@@ -1824,21 +1192,18 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsMapFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ false
+                         /*existingMapEqual*/ true,
+                         /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configHasNoReference/dependency dtsMap changes with timeout before request", session);
                 });
                 it(`when dependency file's map changes, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -1850,39 +1215,28 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configHasNoReference/dependency dtsMap changes", session);
                 });
 
                 it(`with depedency files map file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsMapLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsMapLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configHasNoReference/dependency dtsMap not present", session);
                 });
                 it(`with depedency files map file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -1894,22 +1248,14 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsMapLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles()
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configHasNoReference/dependency dtsMap created", session);
                 });
                 it(`with depedency files map file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -1918,48 +1264,29 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsMapLocation);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as fileNotPresentKey
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configHasNoReference/dependency dtsMap deleted", session);
                 });
 
                 it(`with depedency .d.ts file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configHasNoReference/dependency dts not present", session);
                 });
                 it(`with depedency .d.ts file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -1971,22 +1298,14 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles()
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configHasNoReference/dependency dts created", session);
                 });
                 it(`with depedency .d.ts file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -1995,25 +1314,14 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsLocation);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        // Map is collected after file open
-                        expectedScriptInfosWhenNoDts().concat(dtsMapLocation),
-                        expectedWatchedFilesWhenNoDts().concat(dtsPath),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as "noDts"
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configHasNoReference/dependency dts deleted", session);
                 });
             });
             describe("when main tsconfig has project reference", () => {
@@ -2026,26 +1334,17 @@ ${dependencyTs.content}`);
                 }
 
                 it("rename locations from dependency", () => {
-                    const { host, session } = setup();
-                    checkProjects(session);
+                    const { session } = setup();
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/rename locations", session);
                 });
 
                 // Edit
@@ -2056,25 +1355,22 @@ ${dependencyTs.content}`);
                     // change
                     makeChangeToDependencyTs(session);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/usage file changes with timeout before request", session);
                 });
                 it(`when usage file changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
-                    const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
+                    const { session, dependencyMap, documentPositionMapper } = setupWithAction();
 
                     // change
                     makeChangeToDependencyTs(session);
@@ -2082,15 +1378,13 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/usage file changes", session);
                 });
 
                 // Edit dts to add new fn
@@ -2101,21 +1395,18 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/dependency dts changes with timeout before request", session);
                 });
                 it(`when dependency .d.ts changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -2127,15 +1418,13 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/dependency dts changes", session);
                 });
 
                 // Edit map file to represent added new line
@@ -2146,21 +1435,18 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsMapFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/dependency dtsMap changes with timeout before request", session);
                 });
                 it(`when dependency file's map changes, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -2172,39 +1458,28 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/dependency dtsMap changes", session);
                 });
 
                 it(`with depedency files map file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsMapLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsMapLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/dependency dtsMap not present", session);
                 });
                 it(`with depedency files map file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -2216,22 +1491,14 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsMapLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles()
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/dependency dtsMap created", session);
                 });
                 it(`with depedency files map file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -2240,48 +1507,29 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsMapLocation);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as fileNotPresentKey
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/dependency dtsMap deleted", session);
                 });
 
                 it(`with depedency .d.ts file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/dependency dts not present", session);
                 });
                 it(`with depedency .d.ts file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -2293,22 +1541,14 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles()
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/dependency dts created", session);
                 });
                 it(`with depedency .d.ts file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -2317,27 +1557,15 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsLocation);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        // Map is collected after file open
-                        expectedScriptInfosWhenNoDts().concat(dtsMapLocation),
-                        expectedWatchedFilesWhenNoDts().concat(dtsPath),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as "noDts"
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/dependency dts deleted", session);
                 });
-
                 it(`when defining project source changes, when timeout occurs before request`, () => {
                     // Create DocumentPositionMapper
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -2351,25 +1579,22 @@ ${dependencyTs.content}`);
 `}
                     });
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTsWithDependencyChange,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/dependency source changes with timeout before request", session);
                 });
                 it(`when defining project source changes, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
-                    const { host, session } = setupWithAction();
+                    const { session } = setupWithAction();
 
                     // change
                     // Make change, without rebuild of solution
@@ -2383,39 +1608,29 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTsWithDependencyChange,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
-                        /*existingDependencyMap*/ undefined,
-                        /*existingDocumentPositionMapper*/ undefined,
-                        /*existingMapEqual*/ false,
-                        /*existingDocumentPositionMapperEqual*/ false
+                       /*existingDependencyMap*/ undefined,
+                       /*existingDocumentPositionMapper*/ undefined,
+                       /*existingMapEqual*/ false,
+                       /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/dependency source changes", session);
                 });
 
                 it("when projects are not built", () => {
                     const host = createServerHost(files);
-                    const session = createSession(host);
+                    const session = createSession(host, { logger: createLoggerWithInMemoryLogs() });
                     openFilesForSession([dependencyTs, randomFile], session);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/configWithReference/when projects are not built", session);
                 });
             });
             describe("when main tsconfig has disableSourceOfProjectReferenceRedirect along with project reference", () => {
@@ -2428,26 +1643,17 @@ ${dependencyTs.content}`);
                 }
 
                 it("rename locations from dependency", () => {
-                    const { host, session } = setup();
-                    checkProjects(session);
+                    const { session } = setup();
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/disabledSourceRef/rename locations", session);
                 });
 
                 // Edit
@@ -2458,25 +1664,22 @@ ${dependencyTs.content}`);
                     // change
                     makeChangeToDependencyTs(session);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/disabledSourceRef/usage file changes with timeout before request", session);
                 });
                 it(`when usage file changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
-                    const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
+                    const { session, dependencyMap, documentPositionMapper } = setupWithAction();
 
                     // change
                     makeChangeToDependencyTs(session);
@@ -2484,15 +1687,13 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/disabledSourceRef/usage file changes", session);
                 });
 
                 // Edit dts to add new fn
@@ -2503,21 +1704,18 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/disabledSourceRef/dependency dts changes with timeout before request", session);
                 });
                 it(`when dependency .d.ts changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -2529,15 +1727,13 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/disabledSourceRef/dependency dts changes", session);
                 });
 
                 // Edit map file to represent added new line
@@ -2548,21 +1744,18 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsMapFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/disabledSourceRef/dependency dtsMap changes with timeout before request", session);
                 });
                 it(`when dependency file's map changes, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -2574,39 +1767,28 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/disabledSourceRef/dependency dtsMap changes", session);
                 });
 
                 it(`with depedency files map file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsMapLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsMapLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/disabledSourceRef/dependency dtsMap not present", session);
                 });
                 it(`with depedency files map file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -2618,22 +1800,14 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsMapLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles()
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/disabledSourceRef/dependency dtsMap created", session);
                 });
                 it(`with depedency files map file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -2642,48 +1816,29 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsMapLocation);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as fileNotPresentKey
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/disabledSourceRef/dependency dtsMap deleted", session);
                 });
 
                 it(`with depedency .d.ts file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/disabledSourceRef/dependency dts not present", session);
                 });
                 it(`with depedency .d.ts file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -2695,22 +1850,14 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfos(),
-                        expectedWatchedFiles()
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/disabledSourceRef/dependency dts created", session);
                 });
                 it(`with depedency .d.ts file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -2719,25 +1866,14 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsLocation);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        // Map is collected after file open
-                        expectedScriptInfosWhenNoDts().concat(dtsMapLocation),
-                        expectedWatchedFilesWhenNoDts().concat(dtsPath),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as "noDts"
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoDts(),
-                        expectedWatchedFilesWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependency/disabledSourceRef/dependency dts deleted", session);
                 });
             });
         });
@@ -2745,20 +1881,11 @@ ${dependencyTs.content}`);
         describe("when opening depedency and usage project: goToDef and rename", () => {
             function setupWithActionWith(setup: (onHostCreate?: OnHostCreate) => ReturnType<CreateSessionFn>, onHostCreate: OnHostCreate | undefined) {
                 const result = setup(onHostCreate);
-                result.session.executeCommandSeq(goToDefFromMainTs(1).request);
-                result.session.executeCommandSeq(renameFromDependencyTsWithBothProjectsOpen(1).request);
+                result.session.executeCommandSeq(goToDefFromMainTs(1));
+                result.session.executeCommandSeq(renameFromDependencyTs(1));
                 return { ...result, ...getDocumentPositionMapper(result.session) };
             }
 
-            function verifyScriptInfoCollection(
-                session: TestSession,
-                host: TestServerHost,
-                expectedInfos: readonly string[],
-                expectedWatchedFiles: readonly string[],
-            ) {
-                return verifyScriptInfoCollectionWith(session, host, [mainTs, dependencyTs], expectedInfos, expectedWatchedFiles);
-            }
-
             describe("when main tsconfig doesnt have project reference", () => {
                 function setup(onHostCreate?: OnHostCreate) {
                     return setupWithMainTsAndDependencyTs(createSessionWithoutProjectReferences, onHostCreate);
@@ -2768,64 +1895,11 @@ ${dependencyTs.content}`);
                     return setupWithActionWith(setup, onHostCreate);
                 }
 
-                function checkProjects(session: TestSession) {
-                    checkNumberOfProjects(session.getProjectService(), { configuredProjects: 3 });
-                    checkMainProjectWithoutProjectReferences(session);
-                    checkDependencyProjectWith(session);
-                }
-
-                function checkProjectsWithoutDts(session: TestSession) {
-                    checkNumberOfProjects(session.getProjectService(), { configuredProjects: 3 });
-                    checkMainProjectWithoutProjectReferencesWithoutDts(session);
-                    checkDependencyProjectWith(session);
-                }
-
-                function expectedScriptInfosWhenMapped() {
-                    return [mainTs.path, randomFile.path, dependencyTs.path, libFile.path, dtsPath, dtsMapLocation];
-                }
-
-                function expectedWatchedFilesWhenMapped() {
-                    return [libFile.path, dtsPath, dtsMapPath, mainConfig.path, randomConfig.path, dependencyConfig.path];
-                }
-
-                function expectedScriptInfosWhenNoMap() {
-                    // Because map is deleted, map and dependency are released
-                    return removePath(expectedScriptInfosWhenMapped(), dtsMapPath);
-                }
-
-                function expectedWatchedFilesWhenNoMap() {
-                    // Watches deleted file
-                    return expectedWatchedFilesWhenMapped();
-                }
-
-                function expectedScriptInfosAfterGotoDefWhenNoDts() {
-                    // No dts, no map
-                    return removePath(expectedScriptInfosWhenMapped(), dtsPath, dtsMapPath);
-                }
-
-                function expectedWatchedFilesAfterGotoDefWhenNoDts() {
-                    return removePath(expectedWatchedFilesWhenMapped(), dtsPath, dtsMapPath);
-                }
-
-                function expectedScriptInfosAfterRenameWhenNoDts() {
-                    // No dts, no map
-                    return removePath(expectedScriptInfosWhenMapped(), dtsPath, dtsMapPath);
-                }
-
-                function expectedWatchedFilesAfterRenameWhenNoDts() {
-                    // Watches dts file but not map file
-                    return removePath(expectedWatchedFilesWhenMapped(), dtsMapPath);
-                }
-
                 it("goto Definition in usage and rename locations from defining project", () => {
-                    const { host, session } = setup();
-                    checkProjects(session);
+                    const { session } = setup();
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ false,
@@ -2834,22 +1908,14 @@ ${dependencyTs.content}`);
                     const { dependencyMap, documentPositionMapper } = getDocumentPositionMapper(session);
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configHasNoReference/goToDef and rename locations", session);
                 });
 
                 // Edit
@@ -2861,16 +1927,12 @@ ${dependencyTs.content}`);
                     makeChangeToMainTs(session);
                     makeChangeToDependencyTs(session);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -2878,19 +1940,17 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configHasNoReference/usage file changes with timeout before request", session);
                 });
                 it(`when usage file changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
-                    const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
+                    const { session, dependencyMap, documentPositionMapper } = setupWithAction();
 
                     // change
                     makeChangeToMainTs(session);
@@ -2899,10 +1959,7 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -2910,15 +1967,13 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configHasNoReference/usage file changes", session);
                 });
 
                 // Edit dts to add new fn
@@ -2929,16 +1984,12 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -2946,15 +1997,13 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configHasNoReference/dependency dts changes with timeout before request", session);
                 });
                 it(`when dependency .d.ts changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -2966,10 +2015,7 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -2977,15 +2023,13 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configHasNoReference/dependency dts changes", session);
                 });
 
                 // Edit map file to represent added new line
@@ -2996,16 +2040,12 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsMapFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -3014,15 +2054,13 @@ ${dependencyTs.content}`);
                     const { documentPositionMapper: newDocumentPositionMapper } = getDocumentPositionMapper(session);
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         newDocumentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configHasNoReference/dependency dtsMap changes with timeout before request", session);
                 });
                 it(`when dependency file's map changes, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -3034,10 +2072,7 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -3046,27 +2081,21 @@ ${dependencyTs.content}`);
                     const { documentPositionMapper: newDocumentPositionMapper } = getDocumentPositionMapper(session);
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         newDocumentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configHasNoReference/dependency dtsMap changes", session);
                 });
 
                 it(`with depedency files map file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsMapLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsMapLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoMap,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
+                        goToDefFromMainTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
@@ -3074,22 +2103,14 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configHasNoReference/dependency dtsMap not present", session);
                 });
                 it(`with depedency files map file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -3101,10 +2122,7 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsMapLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
@@ -3113,22 +2131,14 @@ ${dependencyTs.content}`);
                     const { dependencyMap: newDependencyMap, documentPositionMapper: newDocumentPositionMapper } = getDocumentPositionMapper(session);
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         newDependencyMap,
                         newDocumentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped()
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configHasNoReference/dependency dtsMap created", session);
                 });
                 it(`with depedency files map file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -3137,10 +2147,7 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsMapLocation);
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoMap,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
+                        goToDefFromMainTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
@@ -3149,36 +2156,21 @@ ${dependencyTs.content}`);
                     const { dependencyMap: newDependencyMap, documentPositionMapper: newDocumentPositionMapper } = getDocumentPositionMapper(session);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
                         newDependencyMap,
                         newDocumentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as fileNotPresentKey
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configHasNoReference/dependency dtsMap deleted", session);
                 });
 
                 it(`with depedency .d.ts file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsLocation));
-                    checkProjectsWithoutDts(session);
-
+                    const { session } = setup(host => host.deleteFile(dtsLocation));
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoDts,
-                        expectedScriptInfosAfterGotoDefWhenNoDts(),
-                        expectedWatchedFilesAfterGotoDefWhenNoDts(),
+                        goToDefFromMainTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
@@ -3186,22 +2178,14 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosAfterRenameWhenNoDts(),
-                        expectedWatchedFilesAfterRenameWhenNoDts(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjectsWithoutDts(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosAfterRenameWhenNoDts(),
-                        expectedWatchedFilesAfterRenameWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configHasNoReference/dependency dts not present", session);
                 });
                 it(`with depedency .d.ts file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -3213,10 +2197,7 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
@@ -3225,22 +2206,14 @@ ${dependencyTs.content}`);
                     const { dependencyMap: newDependencyMap, documentPositionMapper: newDocumentPositionMapper } = getDocumentPositionMapper(session);
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         newDependencyMap,
                         newDocumentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped()
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configHasNoReference/dependency dts created", session);
                 });
                 it(`with depedency .d.ts file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -3249,11 +2222,7 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsLocation);
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoDts,
-                        // The script info for map is collected only after file open
-                        expectedScriptInfosAfterGotoDefWhenNoDts().concat(dtsMapLocation),
-                        expectedWatchedFilesAfterGotoDefWhenNoDts().concat(dtsMapPath),
+                        goToDefFromMainTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -3261,25 +2230,14 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        // The script info for map is collected only after file open
-                        expectedScriptInfosAfterRenameWhenNoDts().concat(dtsMapLocation),
-                        expectedWatchedFilesAfterRenameWhenNoDts().concat(dtsMapPath),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjectsWithoutDts(session);
-
-                    // Script info collection should behave as "noDts"
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosAfterRenameWhenNoDts(),
-                        expectedWatchedFilesAfterRenameWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configHasNoReference/dependency dts deleted", session);
                 });
             });
             describe("when main tsconfig has project reference", () => {
@@ -3291,57 +2249,11 @@ ${dependencyTs.content}`);
                     return setupWithActionWith(setup, onHostCreate);
                 }
 
-                function checkProjects(session: TestSession) {
-                    checkNumberOfProjects(session.getProjectService(), { configuredProjects: 3 });
-                    checkMainProjectWithProjectReferences(session);
-                    checkDependencyProjectWith(session);
-                }
-
-                function expectedScriptInfosAfterGotoDef() {
-                    return [dependencyTs.path, libFile.path, mainTs.path, randomFile.path];
-                }
-
-                function expectedWatchedFilesAfterGotoDef() {
-                    return [dependencyConfig.path, libFile.path, mainConfig.path, randomConfig.path];
-                }
-
-                function expectedScriptInfosAfterRenameWhenMapped() {
-                    return expectedScriptInfosAfterGotoDef().concat(dtsLocation, dtsMapLocation);
-                }
-
-                function expectedWatchedFilesAfterRenameWhenMapped() {
-                    return expectedWatchedFilesAfterGotoDef().concat(dtsPath, dtsMapPath);
-                }
-
-                function expectedScriptInfosAfterRenameWhenNoMap() {
-                    // Map file is not present
-                    return removePath(expectedScriptInfosAfterRenameWhenMapped(), dtsMapPath);
-                }
-
-                function expectedWatchedFilesAfterRenameWhenNoMap() {
-                    // Watches map file
-                    return expectedWatchedFilesAfterRenameWhenMapped();
-                }
-
-                function expectedScriptInfosAfterRenameWhenNoDts() {
-                    // map and dts not present
-                    return removePath(expectedScriptInfosAfterRenameWhenMapped(), dtsPath, dtsMapPath);
-                }
-
-                function expectedWatchedFilesAfterRenameWhenNoDts() {
-                    // Watches dts file but not map
-                    return removePath(expectedWatchedFilesAfterRenameWhenMapped(), dtsMapPath);
-                }
-
                 it("goto Definition in usage and rename locations from defining project", () => {
-                    const { host, session } = setup();
-                    checkProjects(session);
+                    const { session } = setup();
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosAfterGotoDef(),
-                        expectedWatchedFilesAfterGotoDef(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
@@ -3349,22 +2261,14 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
+                        renameFromDependencyTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/gotoDef and rename locations", session);
                 });
 
                 // Edit
@@ -3376,36 +2280,30 @@ ${dependencyTs.content}`);
                     makeChangeToMainTs(session);
                     makeChangeToDependencyTs(session);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/usage file changes with timeout before request", session);
                 });
                 it(`when usage file changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
-                    const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
+                    const { session, dependencyMap, documentPositionMapper } = setupWithAction();
 
                     // change
                     makeChangeToMainTs(session);
@@ -3414,10 +2312,7 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -3425,15 +2320,13 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/usage file changes", session);
                 });
 
                 // Edit dts to add new fn
@@ -3444,32 +2337,26 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                         /*existingMapEqual*/ true,
+                         /*existingDocumentPositionMapperEqual*/ true
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                         /*existingMapEqual*/ true,
+                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/dependency dts changes with timeout before request", session);
                 });
                 it(`when dependency .d.ts changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -3481,10 +2368,7 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -3492,15 +2376,13 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/dependency dts changes", session);
                 });
 
                 // Edit map file to represent added new line
@@ -3511,16 +2393,12 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsMapFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -3528,15 +2406,13 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/dependency dtsMap changes with timeout before request", session);
                 });
                 it(`when dependency file's map changes, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -3548,38 +2424,29 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                         /*existingMapEqual*/ true,
+                         /*existingDocumentPositionMapperEqual*/ true
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ false
+                         /*existingMapEqual*/ true,
+                         /*existingDocumentPositionMapperEqual*/ false
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/dependency dtsMap changes", session);
                 });
 
                 it(`with depedency files map file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsMapLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsMapLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosAfterGotoDef(),
-                        expectedWatchedFilesAfterGotoDef(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
@@ -3587,22 +2454,14 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosAfterRenameWhenNoMap(),
-                        expectedWatchedFilesAfterRenameWhenNoMap(),
+                        renameFromDependencyTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosAfterRenameWhenNoMap(),
-                        expectedWatchedFilesAfterRenameWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/dependency dtsMap not present", session);
                 });
                 it(`with depedency files map file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -3614,11 +2473,7 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsMapLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosAfterRenameWhenNoMap(),
-                        // Map file is reset so its not watched any more, as this action doesnt need map
-                        removePath(expectedWatchedFilesAfterRenameWhenNoMap(), dtsMapPath),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -3627,22 +2482,14 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/dependency dtsMap created", session);
                 });
                 it(`with depedency files map file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -3651,11 +2498,7 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsMapLocation);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosAfterRenameWhenNoMap(),
-                        // Map file is reset so its not watched any more, as this action doesnt need map
-                        removePath(expectedWatchedFilesAfterRenameWhenNoMap(), dtsMapPath),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
@@ -3664,36 +2507,22 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosAfterRenameWhenNoMap(),
-                        expectedWatchedFilesAfterRenameWhenNoMap(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as fileNotPresentKey
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosAfterRenameWhenNoMap(),
-                        expectedWatchedFilesAfterRenameWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/dependency dtsMap deleted", session);
                 });
 
                 it(`with depedency .d.ts file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosAfterGotoDef(),
-                        expectedWatchedFilesAfterGotoDef(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
@@ -3701,22 +2530,14 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosAfterRenameWhenNoDts(),
-                        expectedWatchedFilesAfterRenameWhenNoDts(),
+                        renameFromDependencyTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosAfterRenameWhenNoDts(),
-                        expectedWatchedFilesAfterRenameWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/dependency dts not present", session);
                 });
                 it(`with depedency .d.ts file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -3728,11 +2549,7 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosAfterGotoDef(),
-                        // Since the project for dependency is not updated, the watcher from rename for dts still there
-                        expectedWatchedFilesAfterGotoDef().concat(dtsPath),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -3740,22 +2557,14 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
                         /*existingDocumentPositionMapperEqual*/ false
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/dependency dts created", session);
                 });
                 it(`with depedency .d.ts file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -3764,12 +2573,7 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsLocation);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        // Map collection after file open
-                        expectedScriptInfosAfterRenameWhenNoDts().concat(dtsMapLocation),
-                        // not watching dts since this operation doesnt need it
-                        removePath(expectedWatchedFilesAfterRenameWhenNoDts(), dtsPath).concat(dtsMapPath),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -3777,27 +2581,15 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        // Map collection after file open
-                        expectedScriptInfosAfterRenameWhenNoDts().concat(dtsMapLocation),
-                        expectedWatchedFilesAfterRenameWhenNoDts().concat(dtsMapPath),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as "noDts"
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosAfterRenameWhenNoDts(),
-                        expectedWatchedFilesAfterRenameWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/dependency dts deleted", session);
                 });
-
                 it(`when defining project source changes, when timeout occurs before request`, () => {
                     // Create DocumentPositionMapper
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -3811,16 +2603,12 @@ ${dependencyTs.content}`);
 `}
                     });
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithDependencyChange,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
+                        goToDefFromMainTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -3828,19 +2616,17 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpenWithDependencyChange,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
+                        renameFromDependencyTsWithDependencyChange,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/dependency source changes with timeout before request", session);
                 });
                 it(`when defining project source changes, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
-                    const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
+                    const { session, dependencyMap, documentPositionMapper } = setupWithAction();
 
                     // change
                     // Make change, without rebuild of solution
@@ -3848,44 +2634,36 @@ ${dependencyTs.content}`);
                         command: protocol.CommandTypes.Change,
                         arguments: {
                             file: dependencyTs.path, line: 1, offset: 1, endLine: 1, endOffset: 1, insertString: `function fooBar() { }
-`}
+ `}
                     });
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithDependencyChange,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
+                        goToDefFromMainTs,
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                         /*existingMapEqual*/ true,
+                         /*existingDocumentPositionMapperEqual*/ true
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpenWithDependencyChange,
-                        expectedScriptInfosAfterRenameWhenMapped(),
-                        expectedWatchedFilesAfterRenameWhenMapped(),
+                        renameFromDependencyTsWithDependencyChange,
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                         /*existingMapEqual*/ true,
+                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/dependency source changes", session);
                 });
 
                 it("when projects are not built", () => {
                     const host = createServerHost(files);
-                    const session = createSession(host);
+                    const session = createSession(host, { logger: createLoggerWithInMemoryLogs() });
                     openFilesForSession([mainTs, dependencyTs, randomFile], session);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosAfterGotoDef(),
-                        expectedWatchedFilesAfterGotoDef(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
@@ -3893,22 +2671,14 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosAfterRenameWhenNoDts(),
-                        expectedWatchedFilesAfterRenameWhenNoDts(),
+                        renameFromDependencyTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosAfterRenameWhenNoDts(),
-                        expectedWatchedFilesAfterRenameWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/configWithReference/when projects are not built", session);
                 });
             });
             describe("when main tsconfig has disableSourceOfProjectReferenceRedirect along with project reference", () => {
@@ -3920,64 +2690,11 @@ ${dependencyTs.content}`);
                     return setupWithActionWith(setup, onHostCreate);
                 }
 
-                function checkProjects(session: TestSession) {
-                    checkNumberOfProjects(session.getProjectService(), { configuredProjects: 3 });
-                    checkMainProjectWithDisabledProjectReferences(session);
-                    checkDependencyProjectWith(session);
-                }
-
-                function checkProjectsWithoutDts(session: TestSession) {
-                    checkNumberOfProjects(session.getProjectService(), { configuredProjects: 3 });
-                    checkMainProjectWithDisabledProjectReferencesWithoutDts(session);
-                    checkDependencyProjectWith(session);
-                }
-
-                function expectedScriptInfosWhenMapped() {
-                    return [mainTs.path, randomFile.path, dependencyTs.path, libFile.path, dtsPath, dtsMapLocation];
-                }
-
-                function expectedWatchedFilesWhenMapped() {
-                    return [libFile.path, dtsPath, dtsMapPath, mainConfig.path, randomConfig.path, dependencyConfig.path];
-                }
-
-                function expectedScriptInfosWhenNoMap() {
-                    // Because map is deleted, map and dependency are released
-                    return removePath(expectedScriptInfosWhenMapped(), dtsMapPath);
-                }
-
-                function expectedWatchedFilesWhenNoMap() {
-                    // Watches deleted file
-                    return expectedWatchedFilesWhenMapped();
-                }
-
-                function expectedScriptInfosAfterGotoDefWhenNoDts() {
-                    // No dts, no map
-                    return removePath(expectedScriptInfosWhenMapped(), dtsPath, dtsMapPath);
-                }
-
-                function expectedWatchedFilesAfterGotoDefWhenNoDts() {
-                    return removePath(expectedWatchedFilesWhenMapped(), dtsPath, dtsMapPath);
-                }
-
-                function expectedScriptInfosAfterRenameWhenNoDts() {
-                    // No dts, no map
-                    return removePath(expectedScriptInfosWhenMapped(), dtsPath, dtsMapPath);
-                }
-
-                function expectedWatchedFilesAfterRenameWhenNoDts() {
-                    // Watches dts file but not map file
-                    return removePath(expectedWatchedFilesWhenMapped(), dtsMapPath);
-                }
-
                 it("goto Definition in usage and rename locations from defining project", () => {
-                    const { host, session } = setup();
-                    checkProjects(session);
+                    const { session } = setup();
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ false,
@@ -3986,22 +2703,14 @@ ${dependencyTs.content}`);
                     const { dependencyMap, documentPositionMapper } = getDocumentPositionMapper(session);
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/disabledSourceRef/gotoDef and rename locations", session);
                 });
 
                 // Edit
@@ -4013,36 +2722,30 @@ ${dependencyTs.content}`);
                     makeChangeToMainTs(session);
                     makeChangeToDependencyTs(session);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                         /*existingMapEqual*/ true,
+                         /*existingDocumentPositionMapperEqual*/ true
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                         /*existingMapEqual*/ true,
+                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/disabledSourceRef/usage file changes with timeout before request", session);
                 });
                 it(`when usage file changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
-                    const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
+                    const { session, dependencyMap, documentPositionMapper } = setupWithAction();
 
                     // change
                     makeChangeToMainTs(session);
@@ -4051,26 +2754,21 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/disabledSourceRef/usage file changes", session);
                 });
 
                 // Edit dts to add new fn
@@ -4081,16 +2779,12 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -4098,15 +2792,13 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/disabledSourceRef/dependency dts changes with timeout before request", session);
                 });
                 it(`when dependency .d.ts changes, document position mapper doesnt change, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -4118,10 +2810,7 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -4129,15 +2818,13 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/disabledSourceRef/dependency dts changes", session);
                 });
 
                 // Edit map file to represent added new line
@@ -4148,33 +2835,27 @@ ${dependencyTs.content}`);
                     // change
                     changeDtsMapFile(host);
                     host.runQueuedTimeoutCallbacks();
-                    checkProjects(session);
                     verifyDocumentPositionMapperEqual(session, dependencyMap, documentPositionMapper);
 
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ false
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ false
                     );
                     const { documentPositionMapper: newDocumentPositionMapper } = getDocumentPositionMapper(session);
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         newDocumentPositionMapper,
-                        /*existingMapEqual*/ true,
-                        /*existingDocumentPositionMapperEqual*/ true
+                       /*existingMapEqual*/ true,
+                       /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/disabledSourceRef/dependency dtsMap changes with timeout before request", session);
                 });
                 it(`when dependency file's map changes, when timeout does not occur before request`, () => {
                     // Create DocumentPositionMapper
@@ -4186,10 +2867,7 @@ ${dependencyTs.content}`);
                     // action
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -4198,27 +2876,21 @@ ${dependencyTs.content}`);
                     const { documentPositionMapper: newDocumentPositionMapper } = getDocumentPositionMapper(session);
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         dependencyMap,
                         newDocumentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/disabledSourceRef/dependency dtsMap changes", session);
                 });
 
                 it(`with depedency files map file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsMapLocation));
-                    checkProjects(session);
+                    const { session } = setup(host => host.deleteFile(dtsMapLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoMap,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
+                        goToDefFromMainTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
@@ -4226,22 +2898,14 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/disabledSourceRef/dependency dtsMap not present", session);
                 });
                 it(`with depedency files map file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -4253,10 +2917,7 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsMapLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
@@ -4265,22 +2926,14 @@ ${dependencyTs.content}`);
                     const { dependencyMap: newDependencyMap, documentPositionMapper: newDocumentPositionMapper } = getDocumentPositionMapper(session);
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         newDependencyMap,
                         newDocumentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped()
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/disabledSourceRef/dependency dtsMap created", session);
                 });
                 it(`with depedency files map file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -4289,10 +2942,7 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsMapLocation);
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoMap,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
+                        goToDefFromMainTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
@@ -4301,36 +2951,22 @@ ${dependencyTs.content}`);
                     const { dependencyMap: newDependencyMap, documentPositionMapper: newDocumentPositionMapper } = getDocumentPositionMapper(session);
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
                         newDependencyMap,
                         newDocumentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-
-                    // Script info collection should behave as fileNotPresentKey
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenNoMap(),
-                        expectedWatchedFilesWhenNoMap(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/disabledSourceRef/dependency dtsMap deleted", session);
                 });
 
                 it(`with depedency .d.ts file, when file is not present`, () => {
-                    const { host, session } = setup(host => host.deleteFile(dtsLocation));
-                    checkProjectsWithoutDts(session);
+                    const { session } = setup(host => host.deleteFile(dtsLocation));
 
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoDts,
-                        expectedScriptInfosAfterGotoDefWhenNoDts(),
-                        expectedWatchedFilesAfterGotoDefWhenNoDts(),
+                        goToDefFromMainTs,
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
@@ -4338,22 +2974,14 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        expectedScriptInfosAfterRenameWhenNoDts(),
-                        expectedWatchedFilesAfterRenameWhenNoDts(),
                         /*existingDependencyMap*/ undefined,
                         /*existingDocumentPositionMapper*/ undefined,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjectsWithoutDts(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosAfterRenameWhenNoDts(),
-                        expectedWatchedFilesAfterRenameWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/disabledSourceRef/dependency dts not present", session);
                 });
                 it(`with depedency .d.ts file, when file is created after actions on projects`, () => {
                     let fileContents: string;
@@ -4365,10 +2993,7 @@ ${dependencyTs.content}`);
                     host.writeFile(dtsLocation, fileContents!);
                     verifyAllFnAction(
                         session,
-                        host,
                         goToDefFromMainTs,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ false,
@@ -4377,22 +3002,14 @@ ${dependencyTs.content}`);
                     const { dependencyMap: newDependencyMap, documentPositionMapper: newDocumentPositionMapper } = getDocumentPositionMapper(session);
                     verifyAllFnAction(
                         session,
-                        host,
-                        renameFromDependencyTsWithBothProjectsOpen,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped(),
+                        renameFromDependencyTs,
                         newDependencyMap,
                         newDocumentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjects(session);
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosWhenMapped(),
-                        expectedWatchedFilesWhenMapped()
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/disabledSourceRef/dependency dts created", session);
                 });
                 it(`with depedency .d.ts file, when file is deleted after actions on the projects`, () => {
                     const { host, session, dependencyMap, documentPositionMapper } = setupWithAction();
@@ -4401,11 +3018,7 @@ ${dependencyTs.content}`);
                     host.deleteFile(dtsLocation);
                     verifyAllFnAction(
                         session,
-                        host,
-                        goToDefFromMainTsWithNoDts,
-                        // The script info for map is collected only after file open
-                        expectedScriptInfosAfterGotoDefWhenNoDts().concat(dtsMapLocation),
-                        expectedWatchedFilesAfterGotoDefWhenNoDts().concat(dtsMapPath),
+                        goToDefFromMainTs,
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
@@ -4413,27 +3026,16 @@ ${dependencyTs.content}`);
                     );
                     verifyAllFnAction(
                         session,
-                        host,
                         renameFromDependencyTs,
-                        // The script info for map is collected only after file open
-                        expectedScriptInfosAfterRenameWhenNoDts().concat(dtsMapLocation),
-                        expectedWatchedFilesAfterRenameWhenNoDts().concat(dtsMapPath),
                         dependencyMap,
                         documentPositionMapper,
                         /*existingMapEqual*/ true,
                         /*existingDocumentPositionMapperEqual*/ true
                     );
-                    checkProjectsWithoutDts(session);
-
-                    // Script info collection should behave as "noDts"
-                    verifyScriptInfoCollection(
-                        session,
-                        host,
-                        expectedScriptInfosAfterRenameWhenNoDts(),
-                        expectedWatchedFilesAfterRenameWhenNoDts(),
-                    );
+                    verifyScriptInfoCollectionWith(session, [mainTs, dependencyTs]);
+                    baselineTsserverLogs("projectReferencesSourcemap", "dependencyAndUsage/disabledSourceRef/dependency dts deleted", session);
                 });
             });
         });
     });
-}
+}
\ No newline at end of file
diff --git a/src/testRunner/unittests/tsserver/projects.ts b/src/testRunner/unittests/tsserver/projects.ts
index a9df947bf2b73..7bd5af3fa4f34 100644
--- a/src/testRunner/unittests/tsserver/projects.ts
+++ b/src/testRunner/unittests/tsserver/projects.ts
@@ -861,31 +861,30 @@ namespace ts.projectSystem {
                 content: `<html><script language="javascript">var x = 1;</></html>`
             };
             const host = createServerHost([file1]);
-            const projectService = createProjectService(host);
+            const projectService = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
             const projectFileName = "projectFileName";
             projectService.openExternalProject({ projectFileName, options: {}, rootFiles: [{ fileName: file1.path, scriptKind: ScriptKind.JS, hasMixedContent: true }] });
 
-            checkNumberOfProjects(projectService, { externalProjects: 1 });
-            checkWatchedFiles(host, [libFile.path]); // watching the "missing" lib file
 
             const project = projectService.externalProjects[0];
 
             const scriptInfo = project.getScriptInfo(file1.path)!;
             const snap = scriptInfo.getSnapshot();
             const actualText = getSnapshotText(snap);
-            assert.equal(actualText, "", `expected content to be empty string, got "${actualText}"`);
+            projectService.logger.info(`Text of${file1.path}: ${actualText}`);
 
             projectService.openClientFile(file1.path, `var x = 1;`);
             project.updateGraph();
 
             const quickInfo = project.getLanguageService().getQuickInfoAtPosition(file1.path, 4)!;
-            assert.equal(quickInfo.kind, ScriptElementKind.variableElement);
+            projectService.logger.info(`QuickInfo : ${quickInfo.kind}`);
 
             projectService.closeClientFile(file1.path);
 
             const scriptInfo2 = project.getScriptInfo(file1.path)!;
             const actualText2 = getSnapshotText(scriptInfo2.getSnapshot());
-            assert.equal(actualText2, "", `expected content to be empty string, got "${actualText2}"`);
+            projectService.logger.info(`Text of${file1.path}: ${actualText2}`);
+            baselineTsserverLogs("projects", "files with mixed content are handled correctly", projectService);
         });
 
         it("syntax tree cache handles changes in project settings", () => {
diff --git a/src/testRunner/unittests/tsserver/projectsWithReferences.ts b/src/testRunner/unittests/tsserver/projectsWithReferences.ts
index 5af193a70d88e..7f74cde40e902 100644
--- a/src/testRunner/unittests/tsserver/projectsWithReferences.ts
+++ b/src/testRunner/unittests/tsserver/projectsWithReferences.ts
@@ -10,28 +10,17 @@ namespace ts.projectSystem {
             const testsConfig = TestFSWithWatch.getTsBuildProjectFile("sample1", "tests/tsconfig.json");
             const testsIndex = TestFSWithWatch.getTsBuildProjectFile("sample1", "tests/index.ts");
             const host = createServerHost([libFile, coreConfig, coreIndex, coreAnotherModule, coreSomeDecl, logicConfig, logicIndex, testsConfig, testsIndex]);
-            const service = createProjectService(host);
+            const logger = createLoggerWithInMemoryLogs();
+            const service = createProjectService(host, { logger });
             service.openClientFile(testsIndex.path);
 
-            checkWatchedFilesDetailed(host, [coreConfig, coreIndex, coreAnotherModule, logicConfig, logicIndex, testsConfig, libFile].map(f => f.path.toLowerCase()), 1);
-            checkWatchedDirectoriesDetailed(host, emptyArray, 1, /*recursive*/ false);
-            checkWatchedDirectoriesDetailed(host, [
-                TestFSWithWatch.getTsBuildProjectFilePath("sample1", "core"),
-                TestFSWithWatch.getTsBuildProjectFilePath("sample1", "logic"),
-                ...getTypeRootsFromLocation(TestFSWithWatch.getTsBuildProjectFilePath("sample1", "tests"))
-            ], 1, /*recursive*/ true);
-
             // local edit in ts file
             host.appendFile(logicIndex.path, `function foo() {}`);
             host.checkTimeoutQueueLengthAndRun(2);
-            checkNumberOfProjects(service, { configuredProjects: 1 });
-            checkProjectActualFiles(service.configuredProjects.get(testsConfig.path)!, [libFile.path, coreIndex.path, coreAnotherModule.path, logicIndex.path, testsIndex.path, testsConfig.path]);
 
             // non local edit in ts file
             host.appendFile(logicIndex.path, `export function gfoo() {}`);
             host.checkTimeoutQueueLengthAndRun(2);
-            checkNumberOfProjects(service, { configuredProjects: 1 });
-            checkProjectActualFiles(service.configuredProjects.get(testsConfig.path)!, [libFile.path, coreIndex.path, coreAnotherModule.path, logicIndex.path, testsIndex.path, testsConfig.path]);
 
             // change in project reference config file
             host.writeFile(logicConfig.path, JSON.stringify({
@@ -39,8 +28,7 @@ namespace ts.projectSystem {
                 references: [{ path: "../core" }]
             }));
             host.checkTimeoutQueueLengthAndRun(2);
-            checkNumberOfProjects(service, { configuredProjects: 1 });
-            checkProjectActualFiles(service.configuredProjects.get(testsConfig.path)!, [libFile.path, coreIndex.path, coreAnotherModule.path, logicIndex.path, testsIndex.path, testsConfig.path]);
+            baselineTsserverLogs("projectsWithReferences", "sample project", service);
         });
 
         describe("on transitive references in different folders", () => {
@@ -90,47 +78,23 @@ X;`,
 export class A {}`
                 };
                 const host = createServerHost([libFile, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs]);
-                const service = createProjectService(host);
+                const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
                 service.openClientFile(cTs.path);
                 return { host, service, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs };
             }
 
             it("non local edit", () => {
-                const { host, service, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs } = createService();
+                const { host, service, bTs } = createService();
                 checkNumberOfProjects(service, { configuredProjects: 1 });
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(host, [
-                    `${tscWatch.projectRoot}/a`, // Failed to package json
-                    `${tscWatch.projectRoot}/b`, // Failed to package json
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], 1, /*recursive*/ true);
-                checkOrphanScriptInfos(service, emptyArray);
 
                 // non local edit
                 host.appendFile(bTs.path, `export function gFoo() { }`);
                 host.checkTimeoutQueueLengthAndRun(2);
-                checkNumberOfProjects(service, { configuredProjects: 1 });
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(host, [
-                    `${tscWatch.projectRoot}/a`, // Failed to package json
-                    `${tscWatch.projectRoot}/b`, // Failed to package json
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], 1, /*recursive*/ true);
-                checkOrphanScriptInfos(service, emptyArray);
+                baselineTsserverLogs("projectsWithReferences", "transitive references with non local edit", service);
             });
 
             it("edit on config file", () => {
-                const { host, service, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs } = createService();
+                const { host, service, cConfig, refsTs } = createService();
                 const nRefsTs: File = {
                     path: `${tscWatch.projectRoot}/nrefs/a.d.ts`,
                     content: refsTs.content
@@ -140,41 +104,15 @@ export class A {}`
                 cTsConfigJson.compilerOptions.paths = { "@ref/*": ["../nrefs/*"] };
                 host.writeFile(cConfig.path, JSON.stringify(cTsConfigJson));
                 host.checkTimeoutQueueLengthAndRun(2);
-                checkNumberOfProjects(service, { configuredProjects: 1 });
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, nRefsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path, nRefsTs.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(host, [
-                    `${tscWatch.projectRoot}/a`, // Failed to package json
-                    `${tscWatch.projectRoot}/b`, // Failed to package json
-                    `${tscWatch.projectRoot}/nrefs`, // Failed lookup since nrefs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], 1, /*recursive*/ true);
-                // Script infos arent deleted till next file open
-                checkOrphanScriptInfos(service, [refsTs.path]);
 
                 // revert the edit on config file
                 host.writeFile(cConfig.path, cConfig.content);
                 host.checkTimeoutQueueLengthAndRun(2);
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path, nRefsTs.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(host, [
-                    `${tscWatch.projectRoot}/a`, // Failed to package json
-                    `${tscWatch.projectRoot}/b`, // Failed to package json
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], 1, /*recursive*/ true);
-                // Script infos arent deleted till next file open
-                checkOrphanScriptInfos(service, [nRefsTs.path]);
+                baselineTsserverLogs("projectsWithReferences", "transitive references with edit on config file", service);
             });
 
             it("edit in referenced config file", () => {
-                const { host, service, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs } = createService();
+                const { host, service, bConfig, refsTs } = createService();
                 const nRefsTs: File = {
                     path: `${tscWatch.projectRoot}/nrefs/a.d.ts`,
                     content: refsTs.content
@@ -184,107 +122,33 @@ export class A {}`
                 bTsConfigJson.compilerOptions.paths = { "@ref/*": ["../nrefs/*"] };
                 host.writeFile(bConfig.path, JSON.stringify(bTsConfigJson));
                 host.checkTimeoutQueueLengthAndRun(2);
-                checkNumberOfProjects(service, { configuredProjects: 1 });
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, refsTs.path, nRefsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path, nRefsTs.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(host, [
-                    `${tscWatch.projectRoot}/b`, // Failed to package json
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    `${tscWatch.projectRoot}/nrefs`, // Failed lookup since nrefs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], 1, /*recursive*/ true);
-                // Script infos arent deleted till next file open
-                checkOrphanScriptInfos(service, [aTs.path]);
 
                 // revert the edit on config file
                 host.writeFile(bConfig.path, bConfig.content);
                 host.checkTimeoutQueueLengthAndRun(2);
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path, nRefsTs.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(host, [
-                    `${tscWatch.projectRoot}/a`, // Failed to package json
-                    `${tscWatch.projectRoot}/b`, // Failed to package json
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], 1, /*recursive*/ true);
-                // Script infos arent deleted till next file open
-                checkOrphanScriptInfos(service, [nRefsTs.path]);
+                baselineTsserverLogs("projectsWithReferences", "transitive references with edit in referenced config file", service);
             });
 
             it("deleting referenced config file", () => {
-                const { host, service, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs } = createService();
+                const { host, service, bConfig } = createService();
                 host.deleteFile(bConfig.path);
                 host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
-                checkNumberOfProjects(service, { configuredProjects: 1 });
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, bConfig.path, cConfig.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(host, [
-                    `${tscWatch.projectRoot}/b`, // Failed to package json
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], 1, /*recursive*/ true);
-                // Script infos arent deleted till next file open
-                checkOrphanScriptInfos(service, [aTs.path]);
 
                 // revert
                 host.writeFile(bConfig.path, bConfig.content);
                 host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(host, [
-                    `${tscWatch.projectRoot}/a`, // Failed to package json
-                    `${tscWatch.projectRoot}/b`, // Failed to package json
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], 1, /*recursive*/ true);
-                checkOrphanScriptInfos(service, emptyArray);
+                baselineTsserverLogs("projectsWithReferences", "transitive references with deleting referenced config file", service);
             });
 
             it("deleting transitively referenced config file", () => {
-                const { host, service, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs } = createService();
+                const { host, service, aConfig } = createService();
                 host.deleteFile(aConfig.path);
                 host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
-                checkNumberOfProjects(service, { configuredProjects: 1 });
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(host, [
-                    `${tscWatch.projectRoot}/a`, // Failed to package json
-                    `${tscWatch.projectRoot}/b`, // Failed to package json
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], 1, /*recursive*/ true);
-                checkOrphanScriptInfos(service, emptyArray);
 
                 // revert
                 host.writeFile(aConfig.path, aConfig.content);
                 host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(host, [
-                    `${tscWatch.projectRoot}/a`, // Failed to package json
-                    `${tscWatch.projectRoot}/b`, // Failed to package json
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], 1, /*recursive*/ true);
-                checkOrphanScriptInfos(service, emptyArray);
+                baselineTsserverLogs("projectsWithReferences", "transitive references with deleting transitively referenced config file", service);
             });
         });
 
@@ -330,44 +194,22 @@ X;`,
 export class A {}`
                 };
                 const host = createServerHost([libFile, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs]);
-                const service = createProjectService(host);
+                const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
                 service.openClientFile(cTs.path);
                 return { host, service, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs };
             }
 
             it("non local edit", () => {
-                const { host, service, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs } = createService();
-                checkNumberOfProjects(service, { configuredProjects: 1 });
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                const expectedWatchedDirectoriesDetailed = arrayToMap([
-                    `${tscWatch.projectRoot}/c`, // Wild card directory
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], identity, () => 1);
-                expectedWatchedDirectoriesDetailed.set(`${tscWatch.projectRoot}/a`, 2); // Failed to package json and wild card directory
-                expectedWatchedDirectoriesDetailed.set(`${tscWatch.projectRoot}/b`, 2); // Failed to package json and wild card directory
-                checkWatchedDirectoriesDetailed(host, expectedWatchedDirectoriesDetailed, /*recursive*/ true);
-                checkOrphanScriptInfos(service, emptyArray);
+                const { host, service, bTs } = createService();
 
                 // non local edit
                 host.appendFile(bTs.path, `export function gFoo() { }`);
                 host.checkTimeoutQueueLengthAndRun(2);
-                checkNumberOfProjects(service, { configuredProjects: 1 });
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(host, expectedWatchedDirectoriesDetailed, /*recursive*/ true);
-                checkOrphanScriptInfos(service, emptyArray);
+                baselineTsserverLogs("projectsWithReferences", "trasitive references without files with non local edit", service);
             });
 
             it("edit on config file", () => {
-                const { host, service, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs } = createService();
+                const { host, service, cConfig, refsTs } = createService();
                 const nRefsTs: File = {
                     path: `${tscWatch.projectRoot}/nrefs/a.d.ts`,
                     content: refsTs.content
@@ -377,40 +219,15 @@ export class A {}`
                 cTsConfigJson.compilerOptions.paths = { "@ref/*": ["../nrefs/*"] };
                 host.writeFile(cConfig.path, JSON.stringify(cTsConfigJson));
                 host.checkTimeoutQueueLengthAndRun(2);
-                checkNumberOfProjects(service, { configuredProjects: 1 });
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, nRefsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path, nRefsTs.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                const expectedWatchedDirectoriesDetailed = arrayToMap([
-                    `${tscWatch.projectRoot}/c`, // Wild card directory
-                    `${tscWatch.projectRoot}/nrefs`, // Failed lookup since nrefs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], identity, () => 1);
-                expectedWatchedDirectoriesDetailed.set(`${tscWatch.projectRoot}/a`, 2); // Failed to package json and wild card directory
-                expectedWatchedDirectoriesDetailed.set(`${tscWatch.projectRoot}/b`, 2); // Failed to package json and wild card directory
-                checkWatchedDirectoriesDetailed(host, expectedWatchedDirectoriesDetailed, /*recursive*/ true);
-                // Script infos arent deleted till next file open
-                checkOrphanScriptInfos(service, [refsTs.path]);
 
                 // revert the edit on config file
                 host.writeFile(cConfig.path, cConfig.content);
                 host.checkTimeoutQueueLengthAndRun(2);
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path, nRefsTs.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                expectedWatchedDirectoriesDetailed.delete(`${tscWatch.projectRoot}/nrefs`);
-                expectedWatchedDirectoriesDetailed.set(`${tscWatch.projectRoot}/refs`, 1);  // Failed lookup since refs/a.ts does not exist
-                checkWatchedDirectoriesDetailed(host, expectedWatchedDirectoriesDetailed, /*recursive*/ true);
-                // Script infos arent deleted till next file open
-                checkOrphanScriptInfos(service, [nRefsTs.path]);
+                baselineTsserverLogs("projectsWithReferences", "trasitive references without files with edit on config file", service);
             });
 
             it("edit in referenced config file", () => {
-                const { host, service, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs } = createService();
+                const { host, service, bConfig, refsTs } = createService();
                 const nRefsTs: File = {
                     path: `${tscWatch.projectRoot}/nrefs/a.d.ts`,
                     content: refsTs.content
@@ -420,108 +237,33 @@ export class A {}`
                 bTsConfigJson.compilerOptions.paths = { "@ref/*": ["../nrefs/*"] };
                 host.writeFile(bConfig.path, JSON.stringify(bTsConfigJson));
                 host.checkTimeoutQueueLengthAndRun(2);
-                checkNumberOfProjects(service, { configuredProjects: 1 });
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, refsTs.path, nRefsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path, nRefsTs.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                const expectedWatchedDirectoriesDetailed = arrayToMap([
-                    `${tscWatch.projectRoot}/a`, // Wild card directory
-                    `${tscWatch.projectRoot}/c`, // Wild card directory
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    `${tscWatch.projectRoot}/nrefs`, // Failed lookup since nrefs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], identity, () => 1);
-                expectedWatchedDirectoriesDetailed.set(`${tscWatch.projectRoot}/b`, 2); // Failed to package json and wild card directory
-                checkWatchedDirectoriesDetailed(host, expectedWatchedDirectoriesDetailed, /*recursive*/ true);
-                // Script infos arent deleted till next file open
-                checkOrphanScriptInfos(service, [aTs.path]);
 
                 // revert the edit on config file
                 host.writeFile(bConfig.path, bConfig.content);
                 host.checkTimeoutQueueLengthAndRun(2);
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path, nRefsTs.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                expectedWatchedDirectoriesDetailed.delete(`${tscWatch.projectRoot}/nrefs`);
-                expectedWatchedDirectoriesDetailed.set(`${tscWatch.projectRoot}/a`, 2); // Failed to package json and wild card directory
-                checkWatchedDirectoriesDetailed(host, expectedWatchedDirectoriesDetailed, /*recursive*/ true);
-                // Script infos arent deleted till next file open
-                checkOrphanScriptInfos(service, [nRefsTs.path]);
+                baselineTsserverLogs("projectsWithReferences", "trasitive references without files with edit in referenced config file", service);
             });
 
             it("deleting referenced config file", () => {
-                const { host, service, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs } = createService();
+                const { host, service, bConfig } = createService();
                 host.deleteFile(bConfig.path);
                 host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
-                checkNumberOfProjects(service, { configuredProjects: 1 });
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, bConfig.path, cConfig.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(host, [
-                    `${tscWatch.projectRoot}/c`, // Wild card directory
-                    `${tscWatch.projectRoot}/b`, // Failed to package json
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], 1, /*recursive*/ true);
-                // Script infos arent deleted till next file open
-                checkOrphanScriptInfos(service, [aTs.path]);
 
                 // revert
                 host.writeFile(bConfig.path, bConfig.content);
                 host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                const expectedWatchedDirectoriesDetailed = arrayToMap([
-                    `${tscWatch.projectRoot}/c`, // Wild card directory
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], identity, () => 1);
-                expectedWatchedDirectoriesDetailed.set(`${tscWatch.projectRoot}/a`, 2); // Failed to package json and wild card directory
-                expectedWatchedDirectoriesDetailed.set(`${tscWatch.projectRoot}/b`, 2); // Failed to package json and wild card directory
-                checkWatchedDirectoriesDetailed(host, expectedWatchedDirectoriesDetailed, /*recursive*/ true);
-                checkOrphanScriptInfos(service, emptyArray);
+                baselineTsserverLogs("projectsWithReferences", "trasitive references without files with deleting referenced config file", service);
             });
 
             it("deleting transitively referenced config file", () => {
-                const { host, service, aConfig, bConfig, cConfig, aTs, bTs, cTs, refsTs } = createService();
+                const { host, service, aConfig } = createService();
                 host.deleteFile(aConfig.path);
                 host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
-                checkNumberOfProjects(service, { configuredProjects: 1 });
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                const expectedWatchedDirectoriesDetailed = arrayToMap([
-                    `${tscWatch.projectRoot}/c`, // Wild card directory
-                    `${tscWatch.projectRoot}/a`, // Failed to package json
-                    `${tscWatch.projectRoot}/refs`, // Failed lookup since refs/a.ts does not exist
-                    ...getTypeRootsFromLocation(`${tscWatch.projectRoot}/c`)
-                ], identity, () => 1);
-                expectedWatchedDirectoriesDetailed.set(`${tscWatch.projectRoot}/b`, 2); // Failed to package json and wild card directory
-                checkWatchedDirectoriesDetailed(host, expectedWatchedDirectoriesDetailed, /*recursive*/ true);
-                checkOrphanScriptInfos(service, emptyArray);
 
                 // revert
                 host.writeFile(aConfig.path, aConfig.content);
                 host.checkTimeoutQueueLengthAndRun(3); // Schedules failed lookup invalidation
-                checkProjectActualFiles(service.configuredProjects.get(cConfig.path)!, [libFile.path, cTs.path, cConfig.path, bTs.path, aTs.path, refsTs.path]);
-                checkWatchedFilesDetailed(host, [libFile.path, aTs.path, bTs.path, refsTs.path, aConfig.path, bConfig.path, cConfig.path], 1);
-                checkWatchedDirectoriesDetailed(host, [
-                    tscWatch.projectRoot // watches for directories created for resolution of b
-                ], 1, /*recursive*/ false);
-                expectedWatchedDirectoriesDetailed.set(`${tscWatch.projectRoot}/a`, 2); // Failed to package json and wild card directory
-                checkWatchedDirectoriesDetailed(host, expectedWatchedDirectoriesDetailed, /*recursive*/ true);
-                checkOrphanScriptInfos(service, emptyArray);
+                baselineTsserverLogs("projectsWithReferences", "trasitive references without files with deleting transitively referenced config file", service);
             });
         });
     });
diff --git a/src/testRunner/unittests/tsserver/resolutionCache.ts b/src/testRunner/unittests/tsserver/resolutionCache.ts
index a7bdceb9f8439..a750a3b0ef4a9 100644
--- a/src/testRunner/unittests/tsserver/resolutionCache.ts
+++ b/src/testRunner/unittests/tsserver/resolutionCache.ts
@@ -1,10 +1,4 @@
 namespace ts.projectSystem {
-    function createHostModuleResolutionTrace(host: TestServerHost & ModuleResolutionHost) {
-        const resolutionTrace: string[] = [];
-        host.trace = resolutionTrace.push.bind(resolutionTrace);
-        return resolutionTrace;
-    }
-
     describe("unittests:: tsserver:: resolutionCache:: tsserverProjectSystem extra resolution pass in server host", () => {
         it("can load typings that are proper modules", () => {
             const file1 = {
@@ -16,33 +10,14 @@ namespace ts.projectSystem {
                 content: "export let x = 1"
             };
             const host: TestServerHost & ModuleResolutionHost = createServerHost([file1, lib]);
-            const resolutionTrace = createHostModuleResolutionTrace(host);
-            const projectService = createProjectService(host, { typingsInstaller: new TestTypingsInstaller("/a/cache", /*throttleLimit*/5, host) });
+            const projectService = createProjectService(host, {
+                typingsInstaller: new TestTypingsInstaller("/a/cache", /*throttleLimit*/5, host),
+                logger: createLoggerWithInMemoryLogs()
+            });
 
             projectService.setCompilerOptionsForInferredProjects({ traceResolution: true, allowJs: true });
             projectService.openClientFile(file1.path);
-            projectService.checkNumberOfProjects({ inferredProjects: 1 });
-            const proj = projectService.inferredProjects[0];
-
-            assert.deepEqual(resolutionTrace, [
-                "======== Resolving module 'lib' from '/a/b/app.js'. ========",
-                "Module resolution kind is not specified, using 'NodeJs'.",
-                "Loading module 'lib' from 'node_modules' folder, target file type 'TypeScript'.",
-                "Directory '/a/b/node_modules' does not exist, skipping all lookups in it.",
-                "Directory '/a/node_modules' does not exist, skipping all lookups in it.",
-                "Directory '/node_modules' does not exist, skipping all lookups in it.",
-                "Loading module 'lib' from 'node_modules' folder, target file type 'JavaScript'.",
-                "Directory '/a/b/node_modules' does not exist, skipping all lookups in it.",
-                "Directory '/a/node_modules' does not exist, skipping all lookups in it.",
-                "Directory '/node_modules' does not exist, skipping all lookups in it.",
-                "======== Module name 'lib' was not resolved. ========",
-                `Auto discovery for typings is enabled in project '${proj.getProjectName()}'. Running extra resolution pass for module 'lib' using cache location '/a/cache'.`,
-                "File '/a/cache/node_modules/lib.d.ts' does not exist.",
-                "File '/a/cache/node_modules/@types/lib/package.json' does not exist.",
-                "File '/a/cache/node_modules/@types/lib.d.ts' does not exist.",
-                "File '/a/cache/node_modules/@types/lib/index.d.ts' exist - use it as a name resolution result.",
-            ]);
-            checkProjectActualFiles(proj, [file1.path, lib.path]);
+            baselineTsserverLogs("resolutionCache", "can load typings that are proper modules", projectService);
         });
     });
 
@@ -378,117 +353,6 @@ namespace ts.projectSystem {
             return { module1, module2 };
         }
 
-        function verifyTrace(resolutionTrace: string[], expected: string[]) {
-            assert.deepEqual(resolutionTrace, expected);
-            resolutionTrace.length = 0;
-        }
-
-        function getExpectedFileDoesNotExistResolutionTrace(host: TestServerHost, expectedTrace: string[], foundModule: boolean, module: File, directory: string, file: string, ignoreIfParentMissing?: boolean) {
-            if (!foundModule) {
-                const path = combinePaths(directory, file);
-                if (!ignoreIfParentMissing || host.directoryExists(getDirectoryPath(path))) {
-                    if (module.path === path) {
-                        foundModule = true;
-                    }
-                    else {
-                        expectedTrace.push(`File '${path}' does not exist.`);
-                    }
-                }
-            }
-            return foundModule;
-        }
-
-        function getExpectedMissedLocationResolutionTrace(host: TestServerHost, expectedTrace: string[], dirPath: string, module: File, moduleName: string, useNodeModules: boolean, cacheLocation?: string) {
-            let foundModule = false;
-            forEachAncestorDirectory(dirPath, dirPath => {
-                if (dirPath === cacheLocation) {
-                    return foundModule;
-                }
-
-                const directory = useNodeModules ? combinePaths(dirPath, nodeModules) : dirPath;
-                if (useNodeModules && !foundModule && !host.directoryExists(directory)) {
-                    expectedTrace.push(`Directory '${directory}' does not exist, skipping all lookups in it.`);
-                    return undefined;
-                }
-                foundModule = getExpectedFileDoesNotExistResolutionTrace(host, expectedTrace, foundModule, module, directory, `${moduleName}/package.json`, /*ignoreIfParentMissing*/ true);
-                foundModule = getExpectedFileDoesNotExistResolutionTrace(host, expectedTrace, foundModule, module, directory, `${moduleName}.ts`);
-                foundModule = getExpectedFileDoesNotExistResolutionTrace(host, expectedTrace, foundModule, module, directory, `${moduleName}.tsx`);
-                foundModule = getExpectedFileDoesNotExistResolutionTrace(host, expectedTrace, foundModule, module, directory, `${moduleName}.d.ts`);
-                foundModule = getExpectedFileDoesNotExistResolutionTrace(host, expectedTrace, foundModule, module, directory, `${moduleName}/index.ts`, /*ignoreIfParentMissing*/ true);
-                if (useNodeModules && !foundModule) {
-                    expectedTrace.push(`Directory '${directory}/@types' does not exist, skipping all lookups in it.`);
-                }
-                return foundModule ? true : undefined;
-            });
-        }
-
-        function getExpectedResolutionTraceHeader(expectedTrace: string[], file: File, moduleName: string) {
-            expectedTrace.push(
-                `======== Resolving module '${moduleName}' from '${file.path}'. ========`,
-                `Module resolution kind is not specified, using 'NodeJs'.`
-            );
-        }
-
-        function getExpectedResolutionTraceFooter(expectedTrace: string[], module: File, moduleName: string, addRealPathTrace: boolean, ignoreModuleFileFound?: boolean) {
-            if (!ignoreModuleFileFound) {
-                expectedTrace.push(`File '${module.path}' exist - use it as a name resolution result.`);
-            }
-            if (addRealPathTrace) {
-                expectedTrace.push(`Resolving real path for '${module.path}', result '${module.path}'.`);
-            }
-            expectedTrace.push(`======== Module name '${moduleName}' was successfully resolved to '${module.path}'. ========`);
-        }
-
-        function getExpectedModuleResolutionFromCacheTrace(containingFile: File, module: File, moduleName: string, cacheLocation: string): string {
-            return `Reusing resolution of module '${moduleName}' from '${containingFile.path}' found in cache from location '${cacheLocation}', it was successfully resolved to '${module.path}'.`;
-        }
-
-        function getExpectedRelativeModuleResolutionTrace(host: TestServerHost, file: File, module: File, moduleName: string, expectedTrace: string[] = []) {
-            getExpectedResolutionTraceHeader(expectedTrace, file, moduleName);
-            expectedTrace.push(`Loading module as file / folder, candidate module location '${removeFileExtension(module.path)}', target file type 'TypeScript'.`);
-            getExpectedMissedLocationResolutionTrace(host, expectedTrace, getDirectoryPath(normalizePath(combinePaths(getDirectoryPath(file.path), moduleName))), module, moduleName.substring(moduleName.lastIndexOf("/") + 1), /*useNodeModules*/ false);
-            getExpectedResolutionTraceFooter(expectedTrace, module, moduleName, /*addRealPathTrace*/ false);
-            return expectedTrace;
-        }
-
-        function getExpectedNonRelativeModuleResolutionTrace(host: TestServerHost, file: File, module: File, moduleName: string, expectedTrace: string[] = []) {
-            getExpectedResolutionTraceHeader(expectedTrace, file, moduleName);
-            expectedTrace.push(`Loading module '${moduleName}' from 'node_modules' folder, target file type 'TypeScript'.`);
-            getExpectedMissedLocationResolutionTrace(host, expectedTrace, getDirectoryPath(file.path), module, moduleName, /*useNodeModules*/ true);
-            getExpectedResolutionTraceFooter(expectedTrace, module, moduleName, /*addRealPathTrace*/ true);
-            return expectedTrace;
-        }
-
-        function getExpectedNonRelativeModuleResolutionFromCacheTrace(host: TestServerHost, file: File, module: File, moduleName: string, cacheLocation: string, expectedTrace: string[] = []) {
-            getExpectedResolutionTraceHeader(expectedTrace, file, moduleName);
-            expectedTrace.push(`Loading module '${moduleName}' from 'node_modules' folder, target file type 'TypeScript'.`);
-            getExpectedMissedLocationResolutionTrace(host, expectedTrace, getDirectoryPath(file.path), module, moduleName, /*useNodeModules*/ true, cacheLocation);
-            expectedTrace.push(`Resolution for module '${moduleName}' was found in cache from location '${cacheLocation}'.`);
-            getExpectedResolutionTraceFooter(expectedTrace, module, moduleName, /*addRealPathTrace*/ false, /*ignoreModuleFileFound*/ true);
-            return expectedTrace;
-        }
-
-        function getExpectedReusingResolutionFromOldProgram(file: File, moduleFile: File, moduleName: string) {
-            return `Reusing resolution of module '${moduleName}' from '${file.path}' of old program, it was successfully resolved to '${moduleFile.path}'.`;
-        }
-
-        function verifyWatchesWithConfigFile(host: TestServerHost, files: File[], openFile: File, extraExpectedDirectories?: readonly string[]) {
-            const expectedRecursiveDirectories = new Set([tscWatch.projectRoot, `${tscWatch.projectRoot}/${nodeModulesAtTypes}`, ...(extraExpectedDirectories || emptyArray)]);
-            checkWatchedFiles(host, mapDefined(files, f => {
-                if (f === openFile) {
-                    return undefined;
-                }
-                const indexOfNodeModules = f.path.indexOf("/node_modules/");
-                if (indexOfNodeModules === -1) {
-                    return f.path;
-                }
-                expectedRecursiveDirectories.add(f.path.substr(0, indexOfNodeModules + "/node_modules".length));
-                return undefined;
-            }));
-            checkWatchedDirectories(host, [], /*recursive*/ false);
-            checkWatchedDirectories(host, arrayFrom(expectedRecursiveDirectories.values()), /*recursive*/ true);
-        }
-
         describe("from files in same folder", () => {
             function getFiles(fileContent: string) {
                 const file1: File = {
@@ -503,64 +367,34 @@ namespace ts.projectSystem {
             }
 
             it("relative module name", () => {
-                const module1Name = "./module1";
-                const module2Name = "../module2";
-                const fileContent = `import { module1 } from "${module1Name}";import { module2 } from "${module2Name}";`;
+                const fileContent = `import { module1 } from "./module1";import { module2 } from "../module2";`;
                 const { file1, file2 } = getFiles(fileContent);
                 const { module1, module2 } = getModules(`${tscWatch.projectRoot}/src/module1.ts`, `${tscWatch.projectRoot}/module2.ts`);
                 const files = [module1, module2, file1, file2, configFile, libFile];
                 const host = createServerHost(files);
-                const resolutionTrace = createHostModuleResolutionTrace(host);
-                const service = createProjectService(host);
+                const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
                 service.openClientFile(file1.path);
-                const expectedTrace = getExpectedRelativeModuleResolutionTrace(host, file1, module1, module1Name);
-                getExpectedRelativeModuleResolutionTrace(host, file1, module2, module2Name, expectedTrace);
-                expectedTrace.push(getExpectedModuleResolutionFromCacheTrace(file2, module1, module1Name, `${tscWatch.projectRoot}/src`));
-                expectedTrace.push(getExpectedModuleResolutionFromCacheTrace(file2, module2, module2Name, `${tscWatch.projectRoot}/src`));
-                verifyTrace(resolutionTrace, expectedTrace);
-                verifyWatchesWithConfigFile(host, files, file1);
 
                 host.writeFile(file1.path, file1.content + fileContent);
                 host.writeFile(file2.path, file2.content + fileContent);
                 host.runQueuedTimeoutCallbacks();
-                verifyTrace(resolutionTrace, [
-                    getExpectedReusingResolutionFromOldProgram(file1, module1, module1Name),
-                    getExpectedReusingResolutionFromOldProgram(file1, module2, module2Name),
-                    getExpectedReusingResolutionFromOldProgram(file2, module1, module1Name),
-                    getExpectedReusingResolutionFromOldProgram(file2, module2, module2Name),
-                ]);
-                verifyWatchesWithConfigFile(host, files, file1);
+
+                baselineTsserverLogs("resolutionCache", "relative module name from files in same folder", service);
             });
 
             it("non relative module name", () => {
-                const expectedNonRelativeDirectories = [`${tscWatch.projectRoot}/node_modules`, `${tscWatch.projectRoot}/src`];
-                const module1Name = "module1";
-                const module2Name = "module2";
-                const fileContent = `import { module1 } from "${module1Name}";import { module2 } from "${module2Name}";`;
+                const fileContent = `import { module1 } from "module1";import { module2 } from "module2";`;
                 const { file1, file2 } = getFiles(fileContent);
                 const { module1, module2 } = getModules(`${tscWatch.projectRoot}/src/node_modules/module1/index.ts`, `${tscWatch.projectRoot}/node_modules/module2/index.ts`);
                 const files = [module1, module2, file1, file2, configFile, libFile];
                 const host = createServerHost(files);
-                const resolutionTrace = createHostModuleResolutionTrace(host);
-                const service = createProjectService(host);
+                const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
                 service.openClientFile(file1.path);
-                const expectedTrace = getExpectedNonRelativeModuleResolutionTrace(host, file1, module1, module1Name);
-                getExpectedNonRelativeModuleResolutionTrace(host, file1, module2, module2Name, expectedTrace);
-                expectedTrace.push(getExpectedModuleResolutionFromCacheTrace(file2, module1, module1Name, `${tscWatch.projectRoot}/src`));
-                expectedTrace.push(getExpectedModuleResolutionFromCacheTrace(file2, module2, module2Name, `${tscWatch.projectRoot}/src`));
-                verifyTrace(resolutionTrace, expectedTrace);
-                verifyWatchesWithConfigFile(host, files, file1, expectedNonRelativeDirectories);
 
                 host.writeFile(file1.path, file1.content + fileContent);
                 host.writeFile(file2.path, file2.content + fileContent);
                 host.runQueuedTimeoutCallbacks();
-                verifyTrace(resolutionTrace, [
-                    getExpectedReusingResolutionFromOldProgram(file1, module1, module1Name),
-                    getExpectedReusingResolutionFromOldProgram(file1, module2, module2Name),
-                    getExpectedReusingResolutionFromOldProgram(file2, module1, module1Name),
-                    getExpectedReusingResolutionFromOldProgram(file2, module2, module2Name),
-                ]);
-                verifyWatchesWithConfigFile(host, files, file1, expectedNonRelativeDirectories);
+                baselineTsserverLogs("resolutionCache", "non relative module name from files in same folder", service);
             });
         });
 
@@ -586,93 +420,40 @@ namespace ts.projectSystem {
             }
 
             it("relative module name", () => {
-                const module1Name = "./module1";
-                const module2Name = "../module2";
-                const module3Name = "../module1";
-                const module4Name = "../../module2";
-                const module5Name = "../../src/module1";
-                const module6Name = "../src/module1";
-                const fileContent1 = `import { module1 } from "${module1Name}";import { module2 } from "${module2Name}";`;
-                const fileContent2 = `import { module1 } from "${module3Name}";import { module2 } from "${module4Name}";`;
-                const fileContent3 = `import { module1 } from "${module5Name}";import { module2 } from "${module4Name}";`;
-                const fileContent4 = `import { module1 } from "${module6Name}";import { module2 } from "${module2Name}";`;
+                const fileContent1 = `import { module1 } from "./module1";import { module2 } from "../module2";`;
+                const fileContent2 = `import { module1 } from "../module1";import { module2 } from "../../module2";`;
+                const fileContent3 = `import { module1 } from "../../src/module1";import { module2 } from "../../module2";`;
+                const fileContent4 = `import { module1 } from "../src/module1}";import { module2 } from "../module2";`;
                 const { file1, file2, file3, file4 } = getFiles(fileContent1, fileContent2, fileContent3, fileContent4);
                 const { module1, module2 } = getModules(`${tscWatch.projectRoot}/product/src/module1.ts`, `${tscWatch.projectRoot}/product/module2.ts`);
                 const files = [module1, module2, file1, file2, file3, file4, configFile, libFile];
                 const host = createServerHost(files);
-                const resolutionTrace = createHostModuleResolutionTrace(host);
-                const service = createProjectService(host);
+                const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
                 service.openClientFile(file1.path);
-                const expectedTrace = getExpectedRelativeModuleResolutionTrace(host, file1, module1, module1Name);
-                getExpectedRelativeModuleResolutionTrace(host, file1, module2, module2Name, expectedTrace);
-                getExpectedRelativeModuleResolutionTrace(host, file2, module1, module3Name, expectedTrace);
-                getExpectedRelativeModuleResolutionTrace(host, file2, module2, module4Name, expectedTrace);
-                getExpectedRelativeModuleResolutionTrace(host, file4, module1, module6Name, expectedTrace);
-                getExpectedRelativeModuleResolutionTrace(host, file4, module2, module2Name, expectedTrace);
-                getExpectedRelativeModuleResolutionTrace(host, file3, module1, module5Name, expectedTrace);
-                getExpectedRelativeModuleResolutionTrace(host, file3, module2, module4Name, expectedTrace);
-                verifyTrace(resolutionTrace, expectedTrace);
-                verifyWatchesWithConfigFile(host, files, file1);
 
                 host.writeFile(file1.path, file1.content + fileContent1);
                 host.writeFile(file2.path, file2.content + fileContent2);
                 host.writeFile(file3.path, file3.content + fileContent3);
                 host.writeFile(file4.path, file4.content + fileContent4);
                 host.runQueuedTimeoutCallbacks();
-
-                verifyTrace(resolutionTrace, [
-                    getExpectedReusingResolutionFromOldProgram(file1, module1, module1Name),
-                    getExpectedReusingResolutionFromOldProgram(file1, module2, module2Name),
-                    getExpectedReusingResolutionFromOldProgram(file2, module1, module3Name),
-                    getExpectedReusingResolutionFromOldProgram(file2, module2, module4Name),
-                    getExpectedReusingResolutionFromOldProgram(file4, module1, module6Name),
-                    getExpectedReusingResolutionFromOldProgram(file4, module2, module2Name),
-                    getExpectedReusingResolutionFromOldProgram(file3, module1, module5Name),
-                    getExpectedReusingResolutionFromOldProgram(file3, module2, module4Name),
-                ]);
-                verifyWatchesWithConfigFile(host, files, file1);
+                baselineTsserverLogs("resolutionCache", "relative module name from files in different folders", service);
             });
 
             it("non relative module name", () => {
-                const expectedNonRelativeDirectories = [`${tscWatch.projectRoot}/node_modules`, `${tscWatch.projectRoot}/product`];
-                const module1Name = "module1";
-                const module2Name = "module2";
-                const fileContent = `import { module1 } from "${module1Name}";import { module2 } from "${module2Name}";`;
+                const fileContent = `import { module1 } from "module1";import { module2 } from "module2";`;
                 const { file1, file2, file3, file4 } = getFiles(fileContent);
                 const { module1, module2 } = getModules(`${tscWatch.projectRoot}/product/node_modules/module1/index.ts`, `${tscWatch.projectRoot}/node_modules/module2/index.ts`);
                 const files = [module1, module2, file1, file2, file3, file4, configFile, libFile];
                 const host = createServerHost(files);
-                const resolutionTrace = createHostModuleResolutionTrace(host);
-                const service = createProjectService(host);
+                const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
                 service.openClientFile(file1.path);
-                const expectedTrace = getExpectedNonRelativeModuleResolutionTrace(host, file1, module1, module1Name);
-                getExpectedNonRelativeModuleResolutionTrace(host, file1, module2, module2Name, expectedTrace);
-                getExpectedNonRelativeModuleResolutionFromCacheTrace(host, file2, module1, module1Name, getDirectoryPath(file1.path), expectedTrace);
-                getExpectedNonRelativeModuleResolutionFromCacheTrace(host, file2, module2, module2Name, getDirectoryPath(file1.path), expectedTrace);
-                getExpectedNonRelativeModuleResolutionFromCacheTrace(host, file4, module1, module1Name, `${tscWatch.projectRoot}/product`, expectedTrace);
-                getExpectedNonRelativeModuleResolutionFromCacheTrace(host, file4, module2, module2Name, `${tscWatch.projectRoot}/product`, expectedTrace);
-                getExpectedNonRelativeModuleResolutionFromCacheTrace(host, file3, module1, module1Name, getDirectoryPath(file4.path), expectedTrace);
-                getExpectedNonRelativeModuleResolutionFromCacheTrace(host, file3, module2, module2Name, getDirectoryPath(file4.path), expectedTrace);
-                verifyTrace(resolutionTrace, expectedTrace);
-                verifyWatchesWithConfigFile(host, files, file1, expectedNonRelativeDirectories);
 
                 host.writeFile(file1.path, file1.content + fileContent);
                 host.writeFile(file2.path, file2.content + fileContent);
                 host.writeFile(file3.path, file3.content + fileContent);
                 host.writeFile(file4.path, file4.content + fileContent);
                 host.runQueuedTimeoutCallbacks();
-
-                verifyTrace(resolutionTrace, [
-                    getExpectedReusingResolutionFromOldProgram(file1, module1, module1Name),
-                    getExpectedReusingResolutionFromOldProgram(file1, module2, module2Name),
-                    getExpectedReusingResolutionFromOldProgram(file2, module1, module1Name),
-                    getExpectedReusingResolutionFromOldProgram(file2, module2, module2Name),
-                    getExpectedReusingResolutionFromOldProgram(file4, module1, module1Name),
-                    getExpectedReusingResolutionFromOldProgram(file4, module2, module2Name),
-                    getExpectedReusingResolutionFromOldProgram(file3, module1, module1Name),
-                    getExpectedReusingResolutionFromOldProgram(file3, module2, module2Name),
-                ]);
-                verifyWatchesWithConfigFile(host, files, file1, expectedNonRelativeDirectories);
+                baselineTsserverLogs("resolutionCache", "non relative module name from files in different folders", service);
             });
 
             it("non relative module name from inferred project", () => {
@@ -686,135 +467,72 @@ namespace ts.projectSystem {
                 const { module1, module2 } = getModules(`${tscWatch.projectRoot}/product/node_modules/module1/index.ts`, `${tscWatch.projectRoot}/node_modules/module2/index.ts`);
                 const files = [module1, module2, file1, file2, file3, file4, libFile];
                 const host = createServerHost(files);
-                const resolutionTrace = createHostModuleResolutionTrace(host);
-                const service = createProjectService(host);
+                const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
                 service.setCompilerOptionsForInferredProjects({ traceResolution: true });
                 service.openClientFile(file1.path);
-                const expectedTrace = getExpectedRelativeModuleResolutionTrace(host, file1, file2, file2Name);
-                getExpectedRelativeModuleResolutionTrace(host, file1, file4, file4Name, expectedTrace);
-                getExpectedRelativeModuleResolutionTrace(host, file1, file3, file3Name, expectedTrace);
-                getExpectedNonRelativeModuleResolutionTrace(host, file1, module1, module1Name, expectedTrace);
-                getExpectedNonRelativeModuleResolutionTrace(host, file1, module2, module2Name, expectedTrace);
-                getExpectedNonRelativeModuleResolutionFromCacheTrace(host, file2, module1, module1Name, getDirectoryPath(file1.path), expectedTrace);
-                getExpectedNonRelativeModuleResolutionFromCacheTrace(host, file2, module2, module2Name, getDirectoryPath(file1.path), expectedTrace);
-                getExpectedNonRelativeModuleResolutionFromCacheTrace(host, file4, module1, module1Name, `${tscWatch.projectRoot}/product`, expectedTrace);
-                getExpectedNonRelativeModuleResolutionFromCacheTrace(host, file4, module2, module2Name, `${tscWatch.projectRoot}/product`, expectedTrace);
-                getExpectedNonRelativeModuleResolutionFromCacheTrace(host, file3, module1, module1Name, getDirectoryPath(file4.path), expectedTrace);
-                getExpectedNonRelativeModuleResolutionFromCacheTrace(host, file3, module2, module2Name, getDirectoryPath(file4.path), expectedTrace);
-                verifyTrace(resolutionTrace, expectedTrace);
-
-                const currentDirectory = getDirectoryPath(file1.path);
-                const watchedFiles = mapDefined(files, f => f === file1 || f.path.indexOf("/node_modules/") !== -1 ? undefined : f.path)
-                    .concat(getConfigFilesToWatch(`${tscWatch.projectRoot}/product/src`));
-                const watchedRecursiveDirectories = getTypeRootsFromLocation(currentDirectory).concat([
-                    `${currentDirectory}/node_modules`, `${currentDirectory}/feature`, `${tscWatch.projectRoot}/product/${nodeModules}`,
-                    `${tscWatch.projectRoot}/${nodeModules}`, `${tscWatch.projectRoot}/product/test/${nodeModules}`,
-                    `${tscWatch.projectRoot}/product/test/src/${nodeModules}`
-                ]);
-                checkWatches();
-
                 host.writeFile(file1.path, file1.content + importModuleContent);
                 host.writeFile(file2.path, file2.content + importModuleContent);
                 host.writeFile(file3.path, file3.content + importModuleContent);
                 host.writeFile(file4.path, file4.content + importModuleContent);
                 host.runQueuedTimeoutCallbacks();
-
-                verifyTrace(resolutionTrace, [
-                    getExpectedReusingResolutionFromOldProgram(file1, file2, file2Name),
-                    getExpectedReusingResolutionFromOldProgram(file1, file4, file4Name),
-                    getExpectedReusingResolutionFromOldProgram(file1, file3, file3Name),
-                    getExpectedReusingResolutionFromOldProgram(file1, module1, module1Name),
-                    getExpectedReusingResolutionFromOldProgram(file1, module2, module2Name),
-                    getExpectedReusingResolutionFromOldProgram(file2, module1, module1Name),
-                    getExpectedReusingResolutionFromOldProgram(file2, module2, module2Name),
-                    getExpectedReusingResolutionFromOldProgram(file4, module1, module1Name),
-                    getExpectedReusingResolutionFromOldProgram(file4, module2, module2Name),
-                    getExpectedReusingResolutionFromOldProgram(file3, module1, module1Name),
-                    getExpectedReusingResolutionFromOldProgram(file3, module2, module2Name),
-                ]);
-                checkWatches();
-
-                function checkWatches() {
-                    checkWatchedFiles(host, watchedFiles);
-                    checkWatchedDirectories(host, [], /*recursive*/ false);
-                    checkWatchedDirectories(host, watchedRecursiveDirectories, /*recursive*/ true);
-                }
+                baselineTsserverLogs("resolutionCache", "non relative module name from inferred project", service);
             });
         });
 
         describe("when watching directories for failed lookup locations in amd resolution", () => {
-            const nodeFile: File = {
-                path: `${tscWatch.projectRoot}/src/typings/node.d.ts`,
-                content: `
+            function verifyModuleResolution(scenario: string, useNodeFile: boolean) {
+                it(scenario, () => {
+                    const nodeFile: File = {
+                        path: `${tscWatch.projectRoot}/src/typings/node.d.ts`,
+                        content: `
 declare module "fs" {
     export interface something {
     }
 }`
-            };
-            const electronFile: File = {
-                path: `${tscWatch.projectRoot}/src/typings/electron.d.ts`,
-                content: `
+                    };
+                    const electronFile: File = {
+                        path: `${tscWatch.projectRoot}/src/typings/electron.d.ts`,
+                        content: `
 declare module 'original-fs' {
     import * as fs from 'fs';
     export = fs;
 }`
-            };
-            const srcFile: File = {
-                path: `${tscWatch.projectRoot}/src/somefolder/srcfile.ts`,
-                content: `
+                    };
+                    const srcFile: File = {
+                        path: `${tscWatch.projectRoot}/src/somefolder/srcfile.ts`,
+                        content: `
 import { x } from "somefolder/module1";
 import { x } from "somefolder/module2";
 const y = x;`
-            };
-            const moduleFile: File = {
-                path: `${tscWatch.projectRoot}/src/somefolder/module1.ts`,
-                content: `
+                    };
+                    const moduleFile: File = {
+                        path: `${tscWatch.projectRoot}/src/somefolder/module1.ts`,
+                        content: `
 export const x = 10;`
-            };
-            const configFile: File = {
-                path: `${tscWatch.projectRoot}/src/tsconfig.json`,
-                content: JSON.stringify({
-                    compilerOptions: {
-                        module: "amd",
-                        moduleResolution: "classic",
-                        target: "es5",
-                        outDir: "../out",
-                        baseUrl: "./",
-                        typeRoots: ["typings"]
-                    }
-                })
-            };
-
-            function verifyModuleResolution(useNodeFile: boolean) {
-                const files = [...(useNodeFile ? [nodeFile] : []), electronFile, srcFile, moduleFile, configFile, libFile];
-                const host = createServerHost(files);
-                const service = createProjectService(host);
-                service.openClientFile(srcFile.path, srcFile.content, ScriptKind.TS, tscWatch.projectRoot);
-                checkProjectActualFiles(service.configuredProjects.get(configFile.path)!, files.map(f => f.path));
-                checkWatchedFilesDetailed(host, mapDefined(files, f => f === srcFile ? undefined : f.path), 1);
-                if (useNodeFile) {
-                    checkWatchedDirectories(host, emptyArray,  /*recursive*/ false); // since fs resolves to ambient module, shouldnt watch failed lookup
-                }
-                else {
-                    checkWatchedDirectoriesDetailed(host, [`${tscWatch.projectRoot}`, `${tscWatch.projectRoot}/src`], 1,  /*recursive*/ false); // failed lookup for fs
-                }
-                const expectedWatchedDirectories = new Map<string, number>();
-                expectedWatchedDirectories.set(`${tscWatch.projectRoot}/src`, 1); // Wild card
-                expectedWatchedDirectories.set(`${tscWatch.projectRoot}/src/somefolder`, 1); // failedLookup for somefolder/module2
-                expectedWatchedDirectories.set(`${tscWatch.projectRoot}/src/node_modules`, 1); // failed lookup for somefolder/module2
-                expectedWatchedDirectories.set(`${tscWatch.projectRoot}/somefolder`, 1); // failed lookup for somefolder/module2
-                expectedWatchedDirectories.set(`${tscWatch.projectRoot}/node_modules`, 1); // failed lookup for with node_modules/@types/fs
-                expectedWatchedDirectories.set(`${tscWatch.projectRoot}/src/typings`, useNodeFile ? 1 : 2); // typeroot directory + failed lookup if not using node file
-                checkWatchedDirectoriesDetailed(host, expectedWatchedDirectories, /*recursive*/ true);
+                    };
+                    const configFile: File = {
+                        path: `${tscWatch.projectRoot}/src/tsconfig.json`,
+                        content: JSON.stringify({
+                            compilerOptions: {
+                                module: "amd",
+                                moduleResolution: "classic",
+                                target: "es5",
+                                outDir: "../out",
+                                baseUrl: "./",
+                                typeRoots: ["typings"]
+                            }
+                        })
+                    };
+
+                    const files = [...(useNodeFile ? [nodeFile] : []), electronFile, srcFile, moduleFile, configFile, libFile];
+                    const host = createServerHost(files);
+                    const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
+                    service.openClientFile(srcFile.path, srcFile.content, ScriptKind.TS, tscWatch.projectRoot);
+                    baselineTsserverLogs("resolutionCache", scenario, service);
+                });
             }
-
-            it("when resolves to ambient module", () => {
-                verifyModuleResolution(/*useNodeFile*/ true);
-            });
-
-            it("when resolution fails", () => {
-                verifyModuleResolution(/*useNodeFile*/ false);
-            });
+            verifyModuleResolution("when resolves to ambient module", /*useNodeFile*/ true);
+            verifyModuleResolution("when resolution fails", /*useNodeFile*/ false);
         });
 
         describe("ignores files/folder changes in node_modules that start with '.'", () => {
@@ -864,10 +582,7 @@ export const x = 10;`
 
         describe("avoid unnecessary invalidation", () => {
             it("unnecessary lookup invalidation on save", () => {
-                const expectedNonRelativeDirectories = [`${tscWatch.projectRoot}/node_modules`, `${tscWatch.projectRoot}/src`];
-                const module1Name = "module1";
-                const module2Name = "module2";
-                const fileContent = `import { module1 } from "${module1Name}";import { module2 } from "${module2Name}";`;
+                const fileContent = `import { module1 } from "module1";import { module2 } from "module2";`;
                 const file1: File = {
                     path: `${tscWatch.projectRoot}/src/file1.ts`,
                     content: fileContent
@@ -875,17 +590,13 @@ export const x = 10;`
                 const { module1, module2 } = getModules(`${tscWatch.projectRoot}/src/node_modules/module1/index.ts`, `${tscWatch.projectRoot}/node_modules/module2/index.ts`);
                 const files = [module1, module2, file1, configFile, libFile];
                 const host = createServerHost(files);
-                const resolutionTrace = createHostModuleResolutionTrace(host);
-                const service = createProjectService(host);
+                const service = createProjectService(host, { logger: createLoggerWithInMemoryLogs() });
                 service.openClientFile(file1.path);
-                const expectedTrace = getExpectedNonRelativeModuleResolutionTrace(host, file1, module1, module1Name);
-                getExpectedNonRelativeModuleResolutionTrace(host, file1, module2, module2Name, expectedTrace);
-                verifyTrace(resolutionTrace, expectedTrace);
-                verifyWatchesWithConfigFile(host, files, file1, expectedNonRelativeDirectories);
 
                 // invoke callback to simulate saving
                 host.modifyFile(file1.path, file1.content, { invokeFileDeleteCreateAsPartInsteadOfChange: true });
                 host.checkTimeoutQueueLengthAndRun(0);
+                baselineTsserverLogs("resolutionCache", "avoid unnecessary lookup invalidation on save", service);
             });
         });
     });
diff --git a/src/testRunner/unittests/tsserver/syntacticServer.ts b/src/testRunner/unittests/tsserver/syntacticServer.ts
index 6fcc4ba9b5fc6..d36f5984a5379 100644
--- a/src/testRunner/unittests/tsserver/syntacticServer.ts
+++ b/src/testRunner/unittests/tsserver/syntacticServer.ts
@@ -26,61 +26,40 @@ import { something } from "something";
                 content: "{}"
             };
             const host = createServerHost([file1, file2, file3, something, libFile, configFile]);
-            const session = createSession(host, { syntaxOnly: true, useSingleInferredProject: true });
+            const session = createSession(host, { syntaxOnly: true, useSingleInferredProject: true, logger: createLoggerWithInMemoryLogs() });
             return { host, session, file1, file2, file3, something, configFile };
         }
 
         function verifySessionException<T extends server.protocol.Request>(session: TestSession, request: Partial<T>) {
-            let hasException = false;
             try {
                 session.executeCommandSeq(request);
             }
             catch (e) {
-                assert.equal(e.message, `Request: ${request.command} not allowed in LanguageServiceMode.Syntactic`);
-                hasException = true;
+                session.logger.info(e.message);
             }
-            assert.isTrue(hasException);
         }
 
         it("open files are added to inferred project even if config file is present and semantic operations fail", () => {
-            const { host, session, file1, file2, file3, something } = setup();
-            const service = session.getProjectService();
+            const { session, file1, file2, file3, something } = setup();
             openFilesForSession([file1], session);
-            checkNumberOfProjects(service, { inferredProjects: 1 });
-            const project = service.inferredProjects[0];
-            checkProjectActualFiles(project, emptyArray);
             verifyCompletions();
             verifyGoToDefToB();
 
             openFilesForSession([file2], session);
-            checkNumberOfProjects(service, { inferredProjects: 1 });
-            checkProjectActualFiles(project, emptyArray);
             verifyCompletions();
             verifyGoToDefToB();
             verifyGoToDefToC();
 
             openFilesForSession([file3], session);
-            checkNumberOfProjects(service, { inferredProjects: 1 });
-            checkProjectActualFiles(project, emptyArray);
-
             openFilesForSession([something], session);
-            checkNumberOfProjects(service, { inferredProjects: 1 });
-            checkProjectActualFiles(project, emptyArray);
 
             // Close open files and verify resolutions
             closeFilesForSession([file3], session);
-            checkNumberOfProjects(service, { inferredProjects: 1 });
-            checkProjectActualFiles(project, emptyArray);
-
             closeFilesForSession([file2], session);
-            checkNumberOfProjects(service, { inferredProjects: 1 });
-            checkProjectActualFiles(project, emptyArray);
+
+            baselineTsserverLogs("syntacticServer", "files go to inferred project and semantic operations fail", session);
 
             function verifyCompletions() {
-                assert.isFalse(project.languageServiceEnabled);
-                checkWatchedFiles(host, emptyArray);
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ true);
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
                 verifySessionException<protocol.CompletionsRequest>(session, {
                     command: protocol.CommandTypes.Completions,
                     arguments: protocolFileLocationFromSubstring(file1, "prop", { index: 1 })
@@ -113,16 +92,14 @@ import { something } from "something";
                 arguments: { file: file1.path }
             });
 
-            let hasException = false;
             const project = service.inferredProjects[0];
             try {
                 project.getLanguageService().getSemanticDiagnostics(file1.path);
             }
             catch (e) {
-                assert.equal(e.message, `LanguageService Operation: getSemanticDiagnostics not allowed in LanguageServiceMode.Syntactic`);
-                hasException = true;
+                session.logger.info(e.message);
             }
-            assert.isTrue(hasException);
+            baselineTsserverLogs("syntacticServer", "throws on unsupported commands", session);
         });
 
         it("should not include auto type reference directives", () => {
@@ -132,11 +109,8 @@ import { something } from "something";
                 content: "export const something = 10;"
             };
             host.ensureFileOrFolder(atTypes);
-            const service = session.getProjectService();
             openFilesForSession([file1], session);
-            checkNumberOfProjects(service, { inferredProjects: 1 });
-            const project = service.inferredProjects[0];
-            checkProjectActualFiles(project, emptyArray); // Should not contain atTypes
+            baselineTsserverLogs("syntacticServer", "should not include auto type reference directives", session);
         });
 
         it("should not include referenced files from unopened files", () => {
diff --git a/src/testRunner/unittests/tsserver/typingsInstaller.ts b/src/testRunner/unittests/tsserver/typingsInstaller.ts
index 1f3426aa8c7a9..857f21e40342e 100644
--- a/src/testRunner/unittests/tsserver/typingsInstaller.ts
+++ b/src/testRunner/unittests/tsserver/typingsInstaller.ts
@@ -129,38 +129,17 @@ namespace ts.projectSystem {
                 }
             })();
 
-            const projectService = createProjectService(host, { useSingleInferredProject: true, typingsInstaller: installer });
+            const projectService = createProjectService(host, {
+                useSingleInferredProject: true,
+                typingsInstaller: installer,
+                logger: createLoggerWithInMemoryLogs(),
+            });
             projectService.setHostConfiguration({ preferences: { includePackageJsonAutoImports: "off" } });
             projectService.openClientFile(file1.path);
 
-            checkNumberOfProjects(projectService, { configuredProjects: 1 });
-            const p = configuredProjectAt(projectService, 0);
-            checkProjectActualFiles(p, [file1.path, tsconfig.path]);
-
-            const expectedWatchedFiles = new Map<string, number>();
-            expectedWatchedFiles.set(tsconfig.path, 1); // tsserver
-            expectedWatchedFiles.set(libFile.path, 1); // tsserver
-            expectedWatchedFiles.set(packageJson.path, 1); // typing installer
-            checkWatchedFilesDetailed(host, expectedWatchedFiles);
-
-            checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-
-            const expectedWatchedDirectoriesRecursive = new Map<string, number>();
-            expectedWatchedDirectoriesRecursive.set("/a/b", 1); // wild card
-            expectedWatchedDirectoriesRecursive.set("/a/b/node_modules/@types", 1); // type root watch
-            expectedWatchedDirectoriesRecursive.set("/a/b/node_modules", 1); // TypingInstaller
-            expectedWatchedDirectoriesRecursive.set("/a/b/bower_components", 1); // TypingInstaller
-            checkWatchedDirectoriesDetailed(host, expectedWatchedDirectoriesRecursive, /*recursive*/ true);
-
             installer.installAll(/*expectedCount*/ 1);
-
-            checkNumberOfProjects(projectService, { configuredProjects: 1 });
             host.checkTimeoutQueueLengthAndRun(2);
-            checkProjectActualFiles(p, [file1.path, jquery.path, tsconfig.path]);
-            // should not watch jquery
-            checkWatchedFilesDetailed(host, expectedWatchedFiles);
-            checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-            checkWatchedDirectoriesDetailed(host, expectedWatchedDirectoriesRecursive, /*recursive*/ true);
+            baselineTsserverLogs("typingsInstaller", "configured projects", projectService);
         });
 
         it("inferred project (typings installed)", () => {
@@ -1006,28 +985,17 @@ namespace ts.projectSystem {
                 }
             })();
 
-            const projectService = createProjectService(host, { useSingleInferredProject: true, typingsInstaller: installer });
+            const projectService = createProjectService(host, {
+                useSingleInferredProject: true,
+                typingsInstaller: installer,
+                logger: createLoggerWithInMemoryLogs(),
+            });
             projectService.openClientFile(app.path);
 
-            checkNumberOfProjects(projectService, { configuredProjects: 1 });
-            const p = configuredProjectAt(projectService, 0);
-            checkProjectActualFiles(p, [app.path, jsconfig.path]);
-
-            const watchedFilesExpected = new Map<string, number>();
-            watchedFilesExpected.set(jsconfig.path, 1); // project files
-            watchedFilesExpected.set(libFile.path, 1); // project files
-            watchedFilesExpected.set(combinePaths(installer.globalTypingsCacheLocation, "package.json"), 1);
-            checkWatchedFilesDetailed(host, watchedFilesExpected);
-
-            checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-
-            checkWatchedDirectoriesDetailed(host, ["/", "/node_modules", "/bower_components"], 1, /*recursive*/ true);
-
             installer.installAll(/*expectedCount*/ 1);
 
-            checkNumberOfProjects(projectService, { configuredProjects: 1 });
             host.checkTimeoutQueueLengthAndRun(2);
-            checkProjectActualFiles(p, [app.path, jqueryDTS.path, jsconfig.path]);
+            baselineTsserverLogs("typingsInstaller", "configured projects discover from bower_components", projectService);
         });
 
         it("configured projects discover from bower.json", () => {
@@ -1193,30 +1161,18 @@ namespace ts.projectSystem {
                     executeCommand(this, host, installedTypings, typingFiles, cb);
                 }
             })();
-            const service = createProjectService(host, { typingsInstaller: installer });
+            const service = createProjectService(host, {
+                typingsInstaller: installer,
+                logger: createLoggerWithInMemoryLogs(),
+            });
             service.openClientFile(file.path);
 
-            checkWatchedFiles(host, [...getConfigFilesToWatch(getDirectoryPath(file.path)), "/a/lib/lib.d.ts"]);
-            checkWatchedDirectories(host, [], /*recursive*/ false);
-            // Does not include cachePath because that is handled by typingsInstaller
-            checkWatchedDirectories(host, [
-                `${tscWatch.projects}/node_modules`,
-                `${tscWatch.projects}/a/node_modules`,
-                `${tscWatch.projects}/a/b/node_modules`,
-                `${tscWatch.projects}/a/node_modules/@types`,
-                `${tscWatch.projects}/a/b/node_modules/@types`,
-                `${tscWatch.projects}/a/b/bower_components`
-            ], /*recursive*/ true);
-
-            service.checkNumberOfProjects({ inferredProjects: 1 });
-            checkProjectActualFiles(service.inferredProjects[0], [file.path, commanderJS.path]);
-
             installer.installAll(/*expectedCount*/1);
             for (const name of typeNames) {
                 assert.isTrue(host.fileExists(typePath(name)), `typings for '${name}' should be created`);
             }
             host.checkTimeoutQueueLengthAndRun(2);
-            checkProjectActualFiles(service.inferredProjects[0], [file.path, ...typeNames.map(typePath)]);
+            baselineTsserverLogs("typingsInstaller", "redo resolutions pointing to js on typing install", service);
         });
 
         it("should pick typing names from non-relative unresolved imports", () => {
diff --git a/src/testRunner/unittests/tsserver/watchEnvironment.ts b/src/testRunner/unittests/tsserver/watchEnvironment.ts
index 2624e1b6e34db..c523e82a66875 100644
--- a/src/testRunner/unittests/tsserver/watchEnvironment.ts
+++ b/src/testRunner/unittests/tsserver/watchEnvironment.ts
@@ -1,139 +1,108 @@
 namespace ts.projectSystem {
     import Tsc_WatchDirectory = TestFSWithWatch.Tsc_WatchDirectory;
+    function serializeHostWatchesIntoLogger(host: TestServerHost, logger: Logger) {
+        const baselines: string[] = [];
+        host.serializeWatches(baselines);
+        baselines.forEach(s => logger.info(s));
+    }
+
     describe("unittests:: tsserver:: watchEnvironment:: tsserverProjectSystem watchDirectories implementation", () => {
-        function verifyCompletionListWithNewFileInSubFolder(tscWatchDirectory: Tsc_WatchDirectory) {
-            const projectFolder = "/a/username/project";
-            const projectSrcFolder = `${projectFolder}/src`;
-            const configFile: File = {
-                path: `${projectFolder}/tsconfig.json`,
-                content: JSON.stringify({
-                    watchOptions: {
-                        synchronousWatchDirectory: true
-                    }
-                })
-            };
-            const index: File = {
-                path: `${projectSrcFolder}/index.ts`,
-                content: `import {} from "./"`
-            };
-            const file1: File = {
-                path: `${projectSrcFolder}/file1.ts`,
-                content: ""
-            };
+        function verifyCompletionListWithNewFileInSubFolder(scenario: string, tscWatchDirectory: Tsc_WatchDirectory) {
+            it(scenario, () => {
+                const projectFolder = "/a/username/project";
+                const projectSrcFolder = `${projectFolder}/src`;
+                const configFile: File = {
+                    path: `${projectFolder}/tsconfig.json`,
+                    content: JSON.stringify({
+                        watchOptions: {
+                            synchronousWatchDirectory: true
+                        }
+                    })
+                };
+                const index: File = {
+                    path: `${projectSrcFolder}/index.ts`,
+                    content: `import {} from "./"`
+                };
+                const file1: File = {
+                    path: `${projectSrcFolder}/file1.ts`,
+                    content: ""
+                };
 
-            const files = [index, file1, configFile, libFile];
-            const fileNames = files.map(file => file.path);
-            // All closed files(files other than index), project folder, project/src folder and project/node_modules/@types folder
-            const expectedWatchedFiles = arrayToMap(fileNames.slice(1), s => s, () => 1);
-            const expectedWatchedDirectories = new Map<string, number>();
-            const mapOfDirectories = tscWatchDirectory === Tsc_WatchDirectory.NonRecursiveWatchDirectory ?
-                expectedWatchedDirectories :
-                tscWatchDirectory === Tsc_WatchDirectory.WatchFile ?
-                    expectedWatchedFiles :
-                    new Map();
-            // For failed resolution lookup and tsconfig files => cached so only watched only once
-            mapOfDirectories.set(projectFolder, 1);
-            // Through above recursive watches
-            mapOfDirectories.set(projectSrcFolder, 1);
-            // node_modules/@types folder
-            mapOfDirectories.set(`${projectFolder}/${nodeModulesAtTypes}`, 1);
-            const expectedCompletions = ["file1"];
-            const completionPosition = index.content.lastIndexOf('"');
-            const environmentVariables = new Map<string, string>();
-            environmentVariables.set("TSC_WATCHDIRECTORY", tscWatchDirectory);
-            const host = createServerHost(files, { environmentVariables });
-            const projectService = createProjectService(host);
-            projectService.openClientFile(index.path);
-
-            const project = Debug.checkDefined(projectService.configuredProjects.get(configFile.path));
-            verifyProjectAndCompletions();
-
-            // Add file2
-            const file2: File = {
-                path: `${projectSrcFolder}/file2.ts`,
-                content: ""
-            };
-            fileNames.push(file2.path);
-            expectedWatchedFiles.set(file2.path, 1);
-            expectedCompletions.push("file2");
-            host.writeFile(file2.path, file2.content);
-            host.runQueuedTimeoutCallbacks();
-            assert.equal(projectService.configuredProjects.get(configFile.path), project);
-            verifyProjectAndCompletions();
-
-            function verifyProjectAndCompletions() {
-                const completions = project.getLanguageService().getCompletionsAtPosition(index.path, completionPosition, { includeExternalModuleExports: false, includeInsertTextCompletions: false })!;
-                checkArray("Completion Entries", completions.entries.map(e => e.name), expectedCompletions);
-
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ true);
-
-                checkWatchedFilesDetailed(host, expectedWatchedFiles);
-                checkWatchedDirectoriesDetailed(host, expectedWatchedDirectories, /*recursive*/ false);
-                checkProjectActualFiles(project, fileNames);
-            }
+                const files = [index, file1, configFile, libFile];
+                const completionPosition = index.content.lastIndexOf('"');
+                const environmentVariables = new Map<string, string>();
+                environmentVariables.set("TSC_WATCHDIRECTORY", tscWatchDirectory);
+                const host = createServerHost(files, { environmentVariables });
+                const logger = createLoggerWithInMemoryLogs();
+                const projectService = createProjectService(host, { logger });
+                projectService.openClientFile(index.path);
+
+                const project = Debug.checkDefined(projectService.configuredProjects.get(configFile.path));
+                verifyProjectAndCompletions();
+
+                // Add file2
+                const file2: File = {
+                    path: `${projectSrcFolder}/file2.ts`,
+                    content: ""
+                };
+                host.writeFile(file2.path, file2.content);
+                host.runQueuedTimeoutCallbacks();
+                assert.equal(projectService.configuredProjects.get(configFile.path), project);
+                verifyProjectAndCompletions();
+                baselineTsserverLogs("watchEnvironment", scenario, projectService);
+
+                function verifyProjectAndCompletions() {
+                    const completions = project.getLanguageService().getCompletionsAtPosition(index.path, completionPosition, { includeExternalModuleExports: false, includeInsertTextCompletions: false })!;
+                    logger.info(`Completion Entries:: ${JSON.stringify(completions.entries.map(e => e.name))}`);
+                    serializeHostWatchesIntoLogger(host, logger);
+                }
+            });
         }
 
-        it("uses watchFile when file is added to subfolder, completion list has new file", () => {
-            verifyCompletionListWithNewFileInSubFolder(Tsc_WatchDirectory.WatchFile);
-        });
-
-        it("uses non recursive watchDirectory when file is added to subfolder, completion list has new file", () => {
-            verifyCompletionListWithNewFileInSubFolder(Tsc_WatchDirectory.NonRecursiveWatchDirectory);
-        });
-
-        it("uses dynamic polling when file is added to subfolder, completion list has new file", () => {
-            verifyCompletionListWithNewFileInSubFolder(Tsc_WatchDirectory.DynamicPolling);
-        });
+        verifyCompletionListWithNewFileInSubFolder(
+            "uses watchFile when file is added to subfolder",
+            Tsc_WatchDirectory.WatchFile
+        );
+        verifyCompletionListWithNewFileInSubFolder(
+            "uses non recursive watchDirectory when file is added to subfolder",
+            Tsc_WatchDirectory.NonRecursiveWatchDirectory
+        );
+        verifyCompletionListWithNewFileInSubFolder(
+            "uses dynamic polling when file is added to subfolder",
+            Tsc_WatchDirectory.DynamicPolling
+        );
     });
 
     describe("unittests:: tsserver:: watchEnvironment:: tsserverProjectSystem Watched recursive directories with windows style file system", () => {
-        function verifyWatchedDirectories(rootedPath: string, useProjectAtRoot: boolean) {
-            const root = useProjectAtRoot ? rootedPath : `${rootedPath}myfolder/allproject/`;
-            const configFile: File = {
-                path: root + "project/tsconfig.json",
-                content: "{}"
-            };
-            const file1: File = {
-                path: root + "project/file1.ts",
-                content: "let x = 10;"
-            };
-            const file2: File = {
-                path: root + "project/file2.ts",
-                content: "let y = 10;"
-            };
-            const files = [configFile, file1, file2, libFile];
-            const host = createServerHost(files, { windowsStyleRoot: "c:/" });
-            const projectService = createProjectService(host);
-            projectService.openClientFile(file1.path);
-            const project = projectService.configuredProjects.get(configFile.path)!;
-            assert.isDefined(project);
-            const winsowsStyleLibFilePath = "c:/" + libFile.path.substring(1);
-            checkProjectActualFiles(project, files.map(f => f === libFile ? winsowsStyleLibFilePath : f.path));
-            checkWatchedFiles(host, mapDefined(files, f => f === libFile ? winsowsStyleLibFilePath : f === file1 ? undefined : f.path));
-            checkWatchedDirectories(host, [], /*recursive*/ false);
-            checkWatchedDirectories(host, [
-                root + "project",
-                root + "project/node_modules/@types"
-            ].concat(useProjectAtRoot ? [] : [root + nodeModulesAtTypes]), /*recursive*/ true);
-        }
-
-        function verifyRootedDirectoryWatch(rootedPath: string) {
-            it("When project is in rootFolder of style c:/", () => {
-                verifyWatchedDirectories(rootedPath, /*useProjectAtRoot*/ true);
-            });
-
-            it("When files at some folder other than root", () => {
-                verifyWatchedDirectories(rootedPath, /*useProjectAtRoot*/ false);
+        function verifyWatchedDirectories(scenario: string, rootedPath: string, useProjectAtRoot: boolean) {
+            it(scenario, () => {
+                const root = useProjectAtRoot ? rootedPath : `${rootedPath}myfolder/allproject/`;
+                const configFile: File = {
+                    path: root + "project/tsconfig.json",
+                    content: "{}"
+                };
+                const file1: File = {
+                    path: root + "project/file1.ts",
+                    content: "let x = 10;"
+                };
+                const file2: File = {
+                    path: root + "project/file2.ts",
+                    content: "let y = 10;"
+                };
+                const files = [configFile, file1, file2, libFile];
+                const host = createServerHost(files, { windowsStyleRoot: "c:/" });
+                const logger = createLoggerWithInMemoryLogs();
+                const projectService = createProjectService(host, { logger });
+                projectService.openClientFile(file1.path);
+                serializeHostWatchesIntoLogger(host, logger);
+                baselineTsserverLogs("watchEnvironment", scenario, projectService);
             });
         }
 
-        describe("for rootFolder of style c:/", () => {
-            verifyRootedDirectoryWatch("c:/");
-        });
-
-        describe("for rootFolder of style c:/users/username", () => {
-            verifyRootedDirectoryWatch("c:/users/username/");
-        });
+        verifyWatchedDirectories("files at windows style root", "c:/", /*useProjectAtRoot*/ true);
+        verifyWatchedDirectories("files not at windows style root", "c:/", /*useProjectAtRoot*/ false);
+        verifyWatchedDirectories("files at root", "c:/", /*useProjectAtRoot*/ true);
+        verifyWatchedDirectories("files not at root", "c:/", /*useProjectAtRoot*/ false);
     });
 
     it(`unittests:: tsserver:: watchEnvironment:: tsserverProjectSystem recursive watch directory implementation does not watch files/directories in node_modules starting with "."`, () => {
@@ -155,21 +124,14 @@ namespace ts.projectSystem {
             path: `${projectFolder}/node_modules/someFile.d.ts`,
             content: ""
         };
-
-        const fileNames = [index, file1, configFile, libFile].map(file => file.path);
-        // All closed files(files other than index), project folder, project/src folder and project/node_modules/@types folder
-        const expectedWatchedFiles = arrayToMap(fileNames.slice(1), identity, () => 1);
-        const expectedWatchedDirectories = arrayToMap([projectFolder, projectSrcFolder, `${projectFolder}/${nodeModules}`, `${projectFolder}/${nodeModulesAtTypes}`], identity, () => 1);
-
         const environmentVariables = new Map<string, string>();
         environmentVariables.set("TSC_WATCHDIRECTORY", Tsc_WatchDirectory.NonRecursiveWatchDirectory);
         const host = createServerHost([index, file1, configFile, libFile, nodeModulesExistingUnusedFile], { environmentVariables });
-        const projectService = createProjectService(host);
+        const logger = createLoggerWithInMemoryLogs();
+        const projectService = createProjectService(host, { logger });
         projectService.openClientFile(index.path);
 
-        const project = Debug.checkDefined(projectService.configuredProjects.get(configFile.path));
-        verifyProject();
-
+        serializeHostWatchesIntoLogger(host, logger);
         const nodeModulesIgnoredFileFromIgnoreDirectory: File = {
             path: `${projectFolder}/node_modules/.cache/someFile.d.ts`,
             content: ""
@@ -203,51 +165,34 @@ namespace ts.projectSystem {
         ].forEach(ignoredEntity => {
             host.ensureFileOrFolder(ignoredEntity);
             host.checkTimeoutQueueLength(0);
-            verifyProject();
+            serializeHostWatchesIntoLogger(host, logger);
         });
 
-        function verifyProject() {
-            checkWatchedDirectories(host, emptyArray, /*recursive*/ true);
-            checkWatchedFilesDetailed(host, expectedWatchedFiles);
-            checkWatchedDirectoriesDetailed(host, expectedWatchedDirectories, /*recursive*/ false);
-            checkProjectActualFiles(project, fileNames);
-        }
+        serializeHostWatchesIntoLogger(host, logger);
+        baselineTsserverLogs("watchEnvironment", `recursive directory does not watch files starting with dot in node_modules`, projectService);
     });
 
-    describe("unittests:: tsserver:: watchEnvironment:: tsserverProjectSystem watching files with network style paths", () => {
-        function verifyFilePathStyle(path: string) {
-            const windowsStyleRoot = path.substr(0, getRootLength(path));
+    it("unittests:: tsserver:: watchEnvironment:: tsserverProjectSystem watching files with network style paths", () => {
+        const logger = createLoggerWithInMemoryLogs();
+        verifyFilePathStyle("c:/myprojects/project/x.js", logger);
+        verifyFilePathStyle("//vda1cs4850/myprojects/project/x.js", logger);
+        verifyFilePathStyle("//vda1cs4850/c$/myprojects/project/x.js", logger);
+        verifyFilePathStyle("c:/users/username/myprojects/project/x.js", logger);
+        verifyFilePathStyle("//vda1cs4850/c$/users/username/myprojects/project/x.js", logger);
+        baselineTsserverLogs("watchEnvironment", `watching files with network style paths`, { logger });
+
+        function verifyFilePathStyle(path: string, logger: Logger) {
+            logger.info(`For files of style ${path}`);
+            const windowsStyleRoot = path.substring(0, getRootLength(path));
             const host = createServerHost(
                 [libFile, { path, content: "const x = 10" }],
                 { windowsStyleRoot }
             );
-            const service = createProjectService(host);
+            const service = createProjectService(host, { logger });
             service.openClientFile(path);
             checkNumberOfProjects(service, { inferredProjects: 1 });
-            const libPath = `${windowsStyleRoot}${libFile.path.substring(1)}`;
-            checkProjectActualFiles(service.inferredProjects[0], [path, libPath]);
-            checkWatchedFiles(host, [libPath, `${getDirectoryPath(path)}/tsconfig.json`, `${getDirectoryPath(path)}/jsconfig.json`]);
+            serializeHostWatchesIntoLogger(host, logger);
         }
-
-        it("for file of style c:/myprojects/project/x.js", () => {
-            verifyFilePathStyle("c:/myprojects/project/x.js");
-        });
-
-        it("for file of style //vda1cs4850/myprojects/project/x.js", () => {
-            verifyFilePathStyle("//vda1cs4850/myprojects/project/x.js");
-        });
-
-        it("for file of style //vda1cs4850/c$/myprojects/project/x.js", () => {
-            verifyFilePathStyle("//vda1cs4850/c$/myprojects/project/x.js");
-        });
-
-        it("for file of style c:/users/username/myprojects/project/x.js", () => {
-            verifyFilePathStyle("c:/users/username/myprojects/project/x.js");
-        });
-
-        it("for file of style //vda1cs4850/c$/users/username/myprojects/project/x.js", () => {
-            verifyFilePathStyle("//vda1cs4850/c$/users/username/myprojects/project/x.js");
-        });
     });
 
     describe("unittests:: tsserver:: watchEnvironment:: handles watch compiler options", () => {
@@ -258,7 +203,8 @@ namespace ts.projectSystem {
             };
             const files = [libFile, commonFile2, configFile];
             const host = createServerHost(files.concat(commonFile1));
-            const session = createSession(host);
+            const logger = createLoggerWithInMemoryLogs();
+            const session = createSession(host, { logger });
             session.executeCommandSeq<protocol.ConfigureRequest>({
                 command: protocol.CommandTypes.Configure,
                 arguments: {
@@ -267,45 +213,9 @@ namespace ts.projectSystem {
                     }
                 }
             });
-            const service = session.getProjectService();
             openFilesForSession([{ file: commonFile1, projectRootPath: "/a/b" }], session);
-            checkProjectActualFiles(
-                service.configuredProjects.get(configFile.path)!,
-                files.map(f => f.path).concat(commonFile1.path)
-            );
-
-            // Instead of polling watch (= watchedFiles), uses fsWatch
-            checkWatchedFiles(host, emptyArray);
-            checkWatchedDirectoriesDetailed(
-                host,
-                files.map(f => f.path.toLowerCase()),
-                1,
-                /*recursive*/ false,
-                arrayToMap(
-                    files,
-                    f => f.path.toLowerCase(),
-                    f => [{
-                        directoryName: f.path,
-                        fallbackPollingInterval: f === configFile ? PollingInterval.High : PollingInterval.Medium,
-                        fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
-                    }]
-                )
-            );
-            checkWatchedDirectoriesDetailed(
-                host,
-                ["/a/b", "/a/b/node_modules/@types"],
-                1,
-                /*recursive*/ true,
-                arrayToMap(
-                    ["/a/b", "/a/b/node_modules/@types"],
-                    identity,
-                    directoryName => [{
-                        directoryName,
-                        fallbackPollingInterval: PollingInterval.Medium,
-                        fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
-                    }]
-                )
-            );
+            serializeHostWatchesIntoLogger(host, logger);
+            baselineTsserverLogs("watchEnvironment", `with watchFile option as host configuration`, session);
         });
 
         it("with watchDirectory option as host configuration", () => {
@@ -315,7 +225,8 @@ namespace ts.projectSystem {
             };
             const files = [libFile, commonFile2, configFile];
             const host = createServerHost(files.concat(commonFile1), { runWithoutRecursiveWatches: true });
-            const session = createSession(host);
+            const logger = createLoggerWithInMemoryLogs();
+            const session = createSession(host, { logger });
             session.executeCommandSeq<protocol.ConfigureRequest>({
                 command: protocol.CommandTypes.Configure,
                 arguments: {
@@ -324,42 +235,9 @@ namespace ts.projectSystem {
                     }
                 }
             });
-            const service = session.getProjectService();
             openFilesForSession([{ file: commonFile1, projectRootPath: "/a/b" }], session);
-            checkProjectActualFiles(
-                service.configuredProjects.get(configFile.path)!,
-                files.map(f => f.path).concat(commonFile1.path)
-            );
-
-            checkWatchedFilesDetailed(
-                host,
-                files.map(f => f.path.toLowerCase()),
-                1,
-                arrayToMap(
-                    files,
-                    f => f.path.toLowerCase(),
-                    f => [{
-                        fileName: f.path,
-                        pollingInterval: PollingInterval.Low
-                    }]
-                )
-            );
-            checkWatchedDirectoriesDetailed(
-                host,
-                ["/a/b", "/a/b/node_modules/@types"],
-                1,
-                /*recursive*/ false,
-                arrayToMap(
-                    ["/a/b", "/a/b/node_modules/@types"],
-                    identity,
-                    directoryName => [{
-                        directoryName,
-                        fallbackPollingInterval: PollingInterval.Medium,
-                        fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
-                    }]
-                )
-            );
-            checkWatchedDirectories(host, emptyArray, /*recursive*/ true);
+            serializeHostWatchesIntoLogger(host, logger);
+            baselineTsserverLogs("watchEnvironment", `with watchDirectory option as host configuration`, session);
         });
 
         it("with fallbackPolling option as host configuration", () => {
@@ -369,7 +247,8 @@ namespace ts.projectSystem {
             };
             const files = [libFile, commonFile2, configFile];
             const host = createServerHost(files.concat(commonFile1), { runWithoutRecursiveWatches: true, runWithFallbackPolling: true });
-            const session = createSession(host);
+            const logger = createLoggerWithInMemoryLogs();
+            const session = createSession(host, { logger });
             session.executeCommandSeq<protocol.ConfigureRequest>({
                 command: protocol.CommandTypes.Configure,
                 arguments: {
@@ -378,30 +257,9 @@ namespace ts.projectSystem {
                     }
                 }
             });
-            const service = session.getProjectService();
             openFilesForSession([{ file: commonFile1, projectRootPath: "/a/b" }], session);
-            checkProjectActualFiles(
-                service.configuredProjects.get(configFile.path)!,
-                files.map(f => f.path).concat(commonFile1.path)
-            );
-
-            const filePaths = files.map(f => f.path);
-            const allFilePaths = filePaths.concat(["/a/b", "/a/b/node_modules/@types"]);
-            checkWatchedFilesDetailed(
-                host,
-                allFilePaths.map(toLowerCase),
-                1,
-                arrayToMap(
-                    allFilePaths,
-                    toLowerCase,
-                    fileName => [{
-                        fileName,
-                        pollingInterval: contains(filePaths, fileName) ? PollingInterval.Low : PollingInterval.Medium
-                    }]
-                )
-            );
-            checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-            checkWatchedDirectories(host, emptyArray, /*recursive*/ true);
+            serializeHostWatchesIntoLogger(host, logger);
+            baselineTsserverLogs("watchEnvironment", `with fallbackPolling option as host configuration`, session);
         });
 
         it("with watchFile option in configFile", () => {
@@ -415,59 +273,11 @@ namespace ts.projectSystem {
             };
             const files = [libFile, commonFile2, configFile];
             const host = createServerHost(files.concat(commonFile1));
-            const session = createSession(host);
-            const service = session.getProjectService();
+            const logger = createLoggerWithInMemoryLogs();
+            const session = createSession(host, { logger });
             openFilesForSession([{ file: commonFile1, projectRootPath: "/a/b" }], session);
-            checkProjectActualFiles(
-                service.configuredProjects.get(configFile.path)!,
-                files.map(f => f.path).concat(commonFile1.path)
-            );
-
-            // The closed script infos are watched using host settings
-            checkWatchedFilesDetailed(
-                host,
-                [libFile, commonFile2].map(f => f.path.toLowerCase()),
-                1,
-                arrayToMap(
-                    [libFile, commonFile2],
-                    f => f.path.toLowerCase(),
-                    f => [{
-                        fileName: f.path,
-                        pollingInterval: PollingInterval.Low
-                    }]
-                )
-            );
-            // Config file with the setting with fsWatch
-            checkWatchedDirectoriesDetailed(
-                host,
-                [configFile.path.toLowerCase()],
-                1,
-                /*recursive*/ false,
-                arrayToMap(
-                    [configFile.path],
-                    toLowerCase,
-                    directoryName => [{
-                        directoryName,
-                        fallbackPollingInterval: PollingInterval.High,
-                        fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
-                    }]
-                )
-            );
-            checkWatchedDirectoriesDetailed(
-                host,
-                ["/a/b", "/a/b/node_modules/@types"],
-                1,
-                /*recursive*/ true,
-                arrayToMap(
-                    ["/a/b", "/a/b/node_modules/@types"],
-                    identity,
-                    directoryName => [{
-                        directoryName,
-                        fallbackPollingInterval: PollingInterval.Medium,
-                        fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
-                    }]
-                )
-            );
+            serializeHostWatchesIntoLogger(host, logger);
+            baselineTsserverLogs("watchEnvironment", `with watchFile option in configFile`, session);
         });
 
         it("with watchDirectory option in configFile", () => {
@@ -481,43 +291,11 @@ namespace ts.projectSystem {
             };
             const files = [libFile, commonFile2, configFile];
             const host = createServerHost(files.concat(commonFile1), { runWithoutRecursiveWatches: true });
-            const session = createSession(host);
-            const service = session.getProjectService();
+            const logger = createLoggerWithInMemoryLogs();
+            const session = createSession(host, { logger });
             openFilesForSession([{ file: commonFile1, projectRootPath: "/a/b" }], session);
-            checkProjectActualFiles(
-                service.configuredProjects.get(configFile.path)!,
-                files.map(f => f.path).concat(commonFile1.path)
-            );
-
-            checkWatchedFilesDetailed(
-                host,
-                files.map(f => f.path.toLowerCase()),
-                1,
-                arrayToMap(
-                    files,
-                    f => f.path.toLowerCase(),
-                    f => [{
-                        fileName: f.path,
-                        pollingInterval: PollingInterval.Low
-                    }]
-                )
-            );
-            checkWatchedDirectoriesDetailed(
-                host,
-                ["/a/b", "/a/b/node_modules/@types"],
-                1,
-                /*recursive*/ false,
-                arrayToMap(
-                    ["/a/b", "/a/b/node_modules/@types"],
-                    identity,
-                    directoryName => [{
-                        directoryName,
-                        fallbackPollingInterval: PollingInterval.Medium,
-                        fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
-                    }]
-                )
-            );
-            checkWatchedDirectories(host, emptyArray, /*recursive*/ true);
+            serializeHostWatchesIntoLogger(host, logger);
+            baselineTsserverLogs("watchEnvironment", `with watchDirectory option in configFile`, session);
         });
 
         it("with fallbackPolling option in configFile", () => {
@@ -531,7 +309,8 @@ namespace ts.projectSystem {
             };
             const files = [libFile, commonFile2, configFile];
             const host = createServerHost(files.concat(commonFile1), { runWithoutRecursiveWatches: true, runWithFallbackPolling: true });
-            const session = createSession(host);
+            const logger = createLoggerWithInMemoryLogs();
+            const session = createSession(host, { logger });
             session.executeCommandSeq<protocol.ConfigureRequest>({
                 command: protocol.CommandTypes.Configure,
                 arguments: {
@@ -540,30 +319,9 @@ namespace ts.projectSystem {
                     }
                 }
             });
-            const service = session.getProjectService();
             openFilesForSession([{ file: commonFile1, projectRootPath: "/a/b" }], session);
-            checkProjectActualFiles(
-                service.configuredProjects.get(configFile.path)!,
-                files.map(f => f.path).concat(commonFile1.path)
-            );
-
-            const filePaths = files.map(f => f.path);
-            const allFilePaths = filePaths.concat(["/a/b", "/a/b/node_modules/@types"]);
-            checkWatchedFilesDetailed(
-                host,
-                allFilePaths.map(toLowerCase),
-                1,
-                arrayToMap(
-                    allFilePaths,
-                    toLowerCase,
-                    fileName => [{
-                        fileName,
-                        pollingInterval: contains(filePaths, fileName) ? PollingInterval.Low : PollingInterval.Medium
-                    }]
-                )
-            );
-            checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-            checkWatchedDirectories(host, emptyArray, /*recursive*/ true);
+            serializeHostWatchesIntoLogger(host, logger);
+            baselineTsserverLogs("watchEnvironment", `with fallbackPolling option in configFile`, session);
         });
 
         describe("excludeDirectories", () => {
@@ -598,44 +356,31 @@ namespace ts.projectSystem {
                 const { main, bar, foo } = setupFiles();
                 const files = [libFile, main, bar, foo, configFile];
                 const host = createServerHost(files, { currentDirectory: tscWatch.projectRoot });
-                const service = createProjectService(host);
+                const logger = createLoggerWithInMemoryLogs();
+                const service = createProjectService(host, { logger });
                 setupConfigureHost(service, configureHost);
                 service.openClientFile(main.path);
-                return { host, configFile };
+                return { host, service, logger };
             }
 
             it("with excludeDirectories option in configFile", () => {
-                const { host, configFile } = setup();
-                checkWatchedFilesDetailed(host, [configFile.path, libFile.path], 1);
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(
-                    host,
-                    arrayToMap(
-                        [`${tscWatch.projectRoot}/src`, `${tscWatch.projectRoot}/node_modules`],
-                        identity,
-                        f => f === `${tscWatch.projectRoot}/node_modules` ? 1 : 2,
-                    ),
-                    /*recursive*/ true,
-                );
+                const { host, service, logger } = setup();
+                serializeHostWatchesIntoLogger(host, logger);
+                baselineTsserverLogs("watchEnvironment", `with excludeDirectories option in configFile`, service);
             });
 
             it("with excludeDirectories option in configuration", () => {
-                const { host, configFile } = setup(/*configureHost*/ true);
-                checkWatchedFilesDetailed(host, [configFile.path, libFile.path], 1);
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(
-                    host,
-                    [`${tscWatch.projectRoot}/src`],
-                    2,
-                    /*recursive*/ true,
-                );
+                const { host, service, logger } = setup(/*configureHost*/ true);
+                serializeHostWatchesIntoLogger(host, logger);
+                baselineTsserverLogs("watchEnvironment", `with excludeDirectories option in configuration`, service);
             });
 
             function setupExternalProject(configureHost?: boolean) {
                 const { main, bar, foo } = setupFiles();
                 const files = [libFile, main, bar, foo];
                 const host = createServerHost(files, { currentDirectory: tscWatch.projectRoot });
-                const service = createProjectService(host);
+                const logger = createLoggerWithInMemoryLogs();
+                const service = createProjectService(host, { logger });
                 setupConfigureHost(service, configureHost);
                 service.openExternalProject({
                     projectFileName: `${tscWatch.projectRoot}/project.csproj`,
@@ -643,31 +388,19 @@ namespace ts.projectSystem {
                     options: { excludeDirectories: ["node_modules"] }
                 } as protocol.ExternalProject);
                 service.openClientFile(main.path);
-                return host;
+                return { host, service, logger };
             }
 
             it("external project watch options", () => {
-                const host = setupExternalProject();
-                checkWatchedFilesDetailed(host, [libFile.path], 1);
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(
-                    host,
-                    [`${tscWatch.projectRoot}/src`, `${tscWatch.projectRoot}/node_modules`],
-                    1,
-                    /*recursive*/ true,
-                );
+                const { host, service, logger } = setupExternalProject();
+                serializeHostWatchesIntoLogger(host, logger);
+                baselineTsserverLogs("watchEnvironment", `external project watch options`, service);
             });
 
             it("external project watch options in host configuration", () => {
-                const host = setupExternalProject(/*configureHost*/ true);
-                checkWatchedFilesDetailed(host, [libFile.path], 1);
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(
-                    host,
-                    [`${tscWatch.projectRoot}/src`],
-                    1,
-                    /*recursive*/ true,
-                );
+                const { host, service, logger } = setupExternalProject(/*configureHost*/ true);
+                serializeHostWatchesIntoLogger(host, logger);
+                baselineTsserverLogs("watchEnvironment", `external project watch options in host configuration`, service);
             });
 
             it("external project watch options errors", () => {
@@ -700,43 +433,24 @@ namespace ts.projectSystem {
                 const { main, bar, foo } = setupFiles();
                 const files = [libFile, main, bar, foo];
                 const host = createServerHost(files, { currentDirectory: tscWatch.projectRoot });
-                const service = createProjectService(host, { useInferredProjectPerProjectRoot: true });
+                const logger = createLoggerWithInMemoryLogs();
+                const service = createProjectService(host, { useInferredProjectPerProjectRoot: true, logger });
                 setupConfigureHost(service, configureHost);
                 service.setCompilerOptionsForInferredProjects({ excludeDirectories: ["node_modules"] }, tscWatch.projectRoot);
                 service.openClientFile(main.path, main.content, ScriptKind.TS, tscWatch.projectRoot);
-                return host;
+                return { host, service, logger };
             }
 
             it("inferred project watch options", () => {
-                const host = setupInferredProject();
-                checkWatchedFilesDetailed(
-                    host,
-                    [libFile.path, `${tscWatch.projectRoot}/tsconfig.json`, `${tscWatch.projectRoot}/jsconfig.json`, `${tscWatch.projectRoot}/src/tsconfig.json`, `${tscWatch.projectRoot}/src/jsconfig.json`],
-                    1
-                );
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(
-                    host,
-                    [`${tscWatch.projectRoot}/src`, `${tscWatch.projectRoot}/node_modules`],
-                    1,
-                    /*recursive*/ true,
-                );
+                const { host, service, logger } = setupInferredProject();
+                serializeHostWatchesIntoLogger(host, logger);
+                baselineTsserverLogs("watchEnvironment", `inferred project watch options`, service);
             });
 
             it("inferred project watch options in host configuration", () => {
-                const host = setupInferredProject(/*configureHost*/ true);
-                checkWatchedFilesDetailed(
-                    host,
-                    [libFile.path, `${tscWatch.projectRoot}/tsconfig.json`, `${tscWatch.projectRoot}/jsconfig.json`, `${tscWatch.projectRoot}/src/tsconfig.json`, `${tscWatch.projectRoot}/src/jsconfig.json`],
-                    1
-                );
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
-                checkWatchedDirectoriesDetailed(
-                    host,
-                    [`${tscWatch.projectRoot}/src`],
-                    1,
-                    /*recursive*/ true,
-                );
+                const { host, service, logger } = setupInferredProject(/*configureHost*/ true);
+                serializeHostWatchesIntoLogger(host, logger);
+                baselineTsserverLogs("watchEnvironment", `inferred project watch options in host configuration`, service);
             });
 
             it("inferred project watch options errors", () => {
@@ -764,58 +478,23 @@ namespace ts.projectSystem {
     });
 
     describe("unittests:: tsserver:: watchEnvironment:: file names on case insensitive file system", () => {
-        function verifyFileNames(projectRoot: string, projectRootPath: string) {
-            const keyMapper = (str: string) => str.replace(projectRoot, projectRootPath);
-            const file: File = {
-                path: `${projectRoot}/foo.ts`,
-                content: `import { foo } from "bar"`
-            };
-            const host = createServerHost([file, libFile]);
-            const service = createProjectService(host);
-            service.openClientFile(file.path, /*fileContent*/ undefined, /*scriptKind*/ undefined, projectRoot);
-            const expectedWatchFiles = [libFile.path, `${projectRoot}/tsconfig.json`, `${projectRoot}/jsconfig.json`];
-            checkWatchedFilesDetailed(
-                host,
-                expectedWatchFiles.map(keyMapper),
-                1,
-                arrayToMap(
-                    expectedWatchFiles,
-                    keyMapper,
-                    fileName => [{
-                        fileName,
-                        pollingInterval: PollingInterval.Low
-                    }]
-                )
-            );
-            checkWatchedDirectories(host, [], /*recursive*/ false);
-            const expectedWatchedDirectories = [`${projectRoot}/node_modules`, `${projectRoot}/node_modules/@types`];
-            checkWatchedDirectoriesDetailed(
-                host,
-                expectedWatchedDirectories.map(keyMapper),
-                1,
-                /*recursive*/ true,
-                arrayToMap(
-                    expectedWatchedDirectories,
-                    keyMapper,
-                    directoryName => [{
-                        directoryName,
-                        fallbackPollingInterval: PollingInterval.Medium,
-                        fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
-                    }]
-                )
-            );
+        function verifyFileNames(scenario: string, projectRoot: string) {
+            it(scenario, () => {
+                const file: File = {
+                    path: `${projectRoot}/foo.ts`,
+                    content: `import { foo } from "bar"`
+                };
+                const host = createServerHost([file, libFile]);
+                const logger = createLoggerWithInMemoryLogs();
+                const service = createProjectService(host, { logger });
+                service.openClientFile(file.path, /*fileContent*/ undefined, /*scriptKind*/ undefined, projectRoot);
+                serializeHostWatchesIntoLogger(host, logger);
+                baselineTsserverLogs("watchEnvironment", scenario, service);
+            });
         }
 
-        it("project with ascii file names", () => {
-            verifyFileNames("/User/userName/Projects/I", "/user/username/projects/i");
-        });
-
-        it("project with ascii file names with i", () => {
-            verifyFileNames("/User/userName/Projects/i", "/user/username/projects/i");
-        });
-
-        it("project with unicode file names", () => {
-            verifyFileNames("/User/userName/Projects/İ", "/user/username/projects/İ");
-        });
+        verifyFileNames("project with ascii file names", "/User/userName/Projects/I");
+        verifyFileNames("project with ascii file names with i", "/User/userName/Projects/i");
+        verifyFileNames("project with unicode file names", "/User/userName/Projects/İ");
     });
 }
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/loads-missing-files-from-disk.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/loads-missing-files-from-disk.js
new file mode 100644
index 0000000000000..9227eb075d00e
--- /dev/null
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/loads-missing-files-from-disk.js
@@ -0,0 +1,65 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /c
+For info: /c/foo.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+DirectoryWatcher:: Added:: WatchInfo: /c/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /c/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /c 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /c 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /c/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /c/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (1)
+	/c/foo.ts
+
+
+	foo.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /c/foo.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+getSemanticDiagnostics:: /c/foo.ts:: 1
+foo.ts(1,17): error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
+
+fileExists:: [{"key":"/c/tsconfig.json","count":1},{"key":"/c/jsconfig.json","count":1},{"key":"/tsconfig.json","count":1},{"key":"/jsconfig.json","count":1},{"key":"/c/bar.ts","count":1},{"key":"/c/bar.tsx","count":1},{"key":"/c/bar.d.ts","count":1},{"key":"/bar.ts","count":1},{"key":"/bar.tsx","count":1},{"key":"/bar.d.ts","count":1},{"key":"/c/bar.js","count":1},{"key":"/c/bar.jsx","count":1},{"key":"/bar.js","count":1},{"key":"/bar.jsx","count":1},{"key":"/c/package.json","count":1},{"key":"/package.json","count":1}]
+directoryExists:: [{"key":"/c","count":2},{"key":"/","count":2},{"key":"/c/node_modules","count":1},{"key":"/node_modules","count":1},{"key":"/c/node_modules/@types","count":1},{"key":"/node_modules/@types","count":1}]
+getDirectories:: []
+readFile:: [{"key":"/c/foo.ts","count":1}]
+readDirectory:: []
+DirectoryWatcher:: Triggered with /c/bar.d.ts :: WatchInfo: /c 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Scheduled: /dev/null/inferredProject1*FailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /c/bar.d.ts :: WatchInfo: /c 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Running: /dev/null/inferredProject1*FailedLookupInvalidation
+Scheduled: /dev/null/inferredProject1*
+Scheduled: *ensureProjectForOpenFiles*
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: /c/bar.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Close:: WatchInfo: /c/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /c/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/c/bar.d.ts
+	/c/foo.ts
+
+
+	bar.d.ts
+	  Imported via "bar" from file 'foo.ts'
+	foo.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+getSemanticDiagnostics:: /c/foo.ts:: 0
+fileExists:: [{"key":"/c/bar.ts","count":1},{"key":"/c/bar.tsx","count":1},{"key":"/c/bar.d.ts","count":2}]
+directoryExists:: [{"key":"/c","count":1},{"key":"/c/node_modules/@types","count":1},{"key":"/node_modules/@types","count":1}]
+getDirectories:: []
+readFile:: [{"key":"/c/bar.d.ts","count":1}]
+readDirectory:: []
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeout-occurs-after-installation.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeout-occurs-after-installation.js
new file mode 100644
index 0000000000000..863afe7d9d8a4
--- /dev/null
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeout-occurs-after-installation.js
@@ -0,0 +1,656 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/rootfolder/otherfolder/a/b
+For info: /user/username/rootfolder/otherfolder/a/b/app.ts :: Config file name: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+Creating configuration project /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/tsconfig.json 2000 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Config file
+Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/rootfolder/otherfolder/a/b/app.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/rootfolder/otherfolder/a/b/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/rootfolder/otherfolder/a/b/app.ts
+
+
+	../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	app.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbol-observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbol-observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbol-observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbol-observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.bin :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.bin :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.bin :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.bin
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.bin :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts
+	/user/username/rootfolder/otherfolder/a/b/app.ts
+
+
+	../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	node_modules/@types/lodash/index.d.ts
+	  Imported via 'lodash' from file 'app.ts' with packageId '@types/lodash/index.d.ts@4.14.74'
+	  Entry point for implicit type library 'lodash' with packageId '@types/lodash/index.d.ts@4.14.74'
+	app.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeouts-occur-inbetween-installation.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeouts-occur-inbetween-installation.js
new file mode 100644
index 0000000000000..ad8dd6172e475
--- /dev/null
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeouts-occur-inbetween-installation.js
@@ -0,0 +1,704 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/rootfolder/otherfolder/a/b
+For info: /user/username/rootfolder/otherfolder/a/b/app.ts :: Config file name: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+Creating configuration project /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/tsconfig.json 2000 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Config file
+Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/rootfolder/otherfolder/a/b/app.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/rootfolder/otherfolder/a/b/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/rootfolder/otherfolder/a/b/app.ts
+
+
+	../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	app.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json.3017591594 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json.2252192041 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbol-observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbol-observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbol-observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbol-observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.bin :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.bin :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.bin :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.bin
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.bin :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Version: 3 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types/lodash-e56c4fe7 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/lodash-b0733faa :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/rxjs-22375c61 :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/symbol-observable-24bcbbff :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected ignored path: /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging/typescript-8493ea5d :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/.staging :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/symbolle/lib/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/typescript/lib :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/add/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/package.json :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/index.js
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/lodash/index.js :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/bundles :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/operator :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/add/observable/dom :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/scheduler :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/src/util :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/symbol :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/rxjs/testing :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
+Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Running: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json Version: 4 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/rootfolder/otherfolder/a/b/node_modules/@types/lodash/index.d.ts
+	/user/username/rootfolder/otherfolder/a/b/app.ts
+
+
+	../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	node_modules/@types/lodash/index.d.ts
+	  Imported via 'lodash' from file 'app.ts' with packageId '@types/lodash/index.d.ts@4.14.74'
+	  Entry point for implicit type library 'lodash' with packageId '@types/lodash/index.d.ts@4.14.74'
+	app.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/app.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js
new file mode 100644
index 0000000000000..a5aaa57bc2944
--- /dev/null
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-insensitive-file-system.js
@@ -0,0 +1,140 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /Users/someuser/work/applications/frontend/src/app/utils
+For info: /Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts :: Config file name: /Users/someuser/work/applications/frontend/tsconfig.json
+Creating configuration project /Users/someuser/work/applications/frontend/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/tsconfig.json 2000 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Config file
+Config: /Users/someuser/work/applications/frontend/tsconfig.json : {
+ "rootNames": [
+  "/Users/someuser/work/applications/frontend/src/app/redux/configureStore.ts",
+  "/Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts"
+ ],
+ "options": {
+  "strict": true,
+  "strictNullChecks": true,
+  "target": 3,
+  "module": 1,
+  "moduleResolution": 2,
+  "sourceMap": true,
+  "noEmitOnError": true,
+  "experimentalDecorators": true,
+  "emitDecoratorMetadata": true,
+  "types": [
+   "node",
+   "jest"
+  ],
+  "noUnusedLocals": true,
+  "outDir": "/Users/someuser/work/applications/frontend/compiled",
+  "typeRoots": [
+   "/Users/someuser/work/applications/frontend/types",
+   "/Users/someuser/work/applications/frontend/node_modules/@types"
+  ],
+  "baseUrl": "/Users/someuser/work/applications/frontend",
+  "paths": {
+   "*": [
+    "types/*"
+   ]
+  },
+  "pathsBasePath": "/Users/someuser/work/applications/frontend",
+  "configFilePath": "/Users/someuser/work/applications/frontend/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/src/app/redux/configureStore.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /Users/someuser/work/applications/frontend/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.es2016.full.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/types 1 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/types 1 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/node_modules 1 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/node_modules 1 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/node_modules 1 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/node_modules 1 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /Users/someuser/work/applications/frontend/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/Users/someuser/work/applications/frontend/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.es2016.full.d.ts
+	/Users/someuser/work/applications/frontend/src/app/redux/configureStore.ts
+	/Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts
+
+
+	../../../../../a/lib/lib.es2016.full.d.ts
+	  Default library for target 'es2016'
+	src/app/redux/configureStore.ts
+	  Matched by include pattern 'src/**/*' in 'tsconfig.json'
+	src/app/utils/Analytic.ts
+	  Matched by include pattern 'src/**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/Users/someuser/work/applications/frontend/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts ProjectRootPath: undefined
+		Projects: /Users/someuser/work/applications/frontend/tsconfig.json
+DirectoryWatcher:: Triggered with /users/someuser/work/applications/frontend/src/app/utils/Cookie.ts :: WatchInfo: /users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory
+Scheduled: /Users/someuser/work/applications/frontend/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms DirectoryWatcher:: Triggered with /users/someuser/work/applications/frontend/src/app/utils/Cookie.ts :: WatchInfo: /users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory
+Running: /Users/someuser/work/applications/frontend/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /Users/someuser/work/applications/frontend/tsconfig.json
+Finishing updateGraphWorker: Project: /Users/someuser/work/applications/frontend/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/Users/someuser/work/applications/frontend/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.es2016.full.d.ts
+	/Users/someuser/work/applications/frontend/src/app/redux/configureStore.ts
+	/Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts
+	/Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts
+
+
+	../../../../../a/lib/lib.es2016.full.d.ts
+	  Default library for target 'es2016'
+	src/app/redux/configureStore.ts
+	  Matched by include pattern 'src/**/*' in 'tsconfig.json'
+	src/app/utils/Analytic.ts
+	  Matched by include pattern 'src/**/*' in 'tsconfig.json'
+	src/app/utils/Cookie.ts
+	  Matched by include pattern 'src/**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/Users/someuser/work/applications/frontend/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts ProjectRootPath: undefined
+		Projects: /Users/someuser/work/applications/frontend/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/Users/someuser/work/applications/frontend/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts ProjectRootPath: undefined
+		Projects: /Users/someuser/work/applications/frontend/tsconfig.json
+fileExists:: [{"key":"/users/someuser/work/applications/frontend/src/app/utils/cookie.ts","count":1}]
+directoryExists:: [{"key":"/users/someuser/work/applications/frontend/src/app/utils/cookie.ts","count":1}]
+getDirectories:: []
+readFile:: [{"key":"/Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts","count":1}]
+readDirectory:: []
+FileWatcher:: Close:: WatchInfo: /Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts 500 undefined WatchType: Closed Script info
+Search path: /Users/someuser/work/applications/frontend/src/app/utils
+For info: /Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts :: Config file name: /Users/someuser/work/applications/frontend/tsconfig.json
+Project '/Users/someuser/work/applications/frontend/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts ProjectRootPath: undefined
+		Projects: /Users/someuser/work/applications/frontend/tsconfig.json
+	FileName: /Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts ProjectRootPath: undefined
+		Projects: /Users/someuser/work/applications/frontend/tsconfig.json
+fileExists:: []
+directoryExists:: []
+getDirectories:: []
+readFile:: []
+readDirectory:: []
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js
new file mode 100644
index 0000000000000..45c1e3ef41110
--- /dev/null
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/watchDirectories-for-config-file-with-case-sensitive-file-system.js
@@ -0,0 +1,140 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /Users/someuser/work/applications/frontend/src/app/utils
+For info: /Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts :: Config file name: /Users/someuser/work/applications/frontend/tsconfig.json
+Creating configuration project /Users/someuser/work/applications/frontend/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/tsconfig.json 2000 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Config file
+Config: /Users/someuser/work/applications/frontend/tsconfig.json : {
+ "rootNames": [
+  "/Users/someuser/work/applications/frontend/src/app/redux/configureStore.ts",
+  "/Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts"
+ ],
+ "options": {
+  "strict": true,
+  "strictNullChecks": true,
+  "target": 3,
+  "module": 1,
+  "moduleResolution": 2,
+  "sourceMap": true,
+  "noEmitOnError": true,
+  "experimentalDecorators": true,
+  "emitDecoratorMetadata": true,
+  "types": [
+   "node",
+   "jest"
+  ],
+  "noUnusedLocals": true,
+  "outDir": "/Users/someuser/work/applications/frontend/compiled",
+  "typeRoots": [
+   "/Users/someuser/work/applications/frontend/types",
+   "/Users/someuser/work/applications/frontend/node_modules/@types"
+  ],
+  "baseUrl": "/Users/someuser/work/applications/frontend",
+  "paths": {
+   "*": [
+    "types/*"
+   ]
+  },
+  "pathsBasePath": "/Users/someuser/work/applications/frontend",
+  "configFilePath": "/Users/someuser/work/applications/frontend/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/src/app/redux/configureStore.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /Users/someuser/work/applications/frontend/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.es2016.full.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/types 1 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/types 1 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/node_modules 1 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/node_modules 1 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/node_modules 1 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/node_modules 1 undefined Project: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /Users/someuser/work/applications/frontend/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/Users/someuser/work/applications/frontend/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.es2016.full.d.ts
+	/Users/someuser/work/applications/frontend/src/app/redux/configureStore.ts
+	/Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts
+
+
+	../../../../../a/lib/lib.es2016.full.d.ts
+	  Default library for target 'es2016'
+	src/app/redux/configureStore.ts
+	  Matched by include pattern 'src/**/*' in 'tsconfig.json'
+	src/app/utils/Analytic.ts
+	  Matched by include pattern 'src/**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/Users/someuser/work/applications/frontend/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts ProjectRootPath: undefined
+		Projects: /Users/someuser/work/applications/frontend/tsconfig.json
+DirectoryWatcher:: Triggered with /Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts :: WatchInfo: /Users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory
+Scheduled: /Users/someuser/work/applications/frontend/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms DirectoryWatcher:: Triggered with /Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts :: WatchInfo: /Users/someuser/work/applications/frontend/src 1 undefined Config: /Users/someuser/work/applications/frontend/tsconfig.json WatchType: Wild card directory
+Running: /Users/someuser/work/applications/frontend/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /Users/someuser/work/applications/frontend/tsconfig.json
+Finishing updateGraphWorker: Project: /Users/someuser/work/applications/frontend/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/Users/someuser/work/applications/frontend/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.es2016.full.d.ts
+	/Users/someuser/work/applications/frontend/src/app/redux/configureStore.ts
+	/Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts
+	/Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts
+
+
+	../../../../../a/lib/lib.es2016.full.d.ts
+	  Default library for target 'es2016'
+	src/app/redux/configureStore.ts
+	  Matched by include pattern 'src/**/*' in 'tsconfig.json'
+	src/app/utils/Analytic.ts
+	  Matched by include pattern 'src/**/*' in 'tsconfig.json'
+	src/app/utils/Cookie.ts
+	  Matched by include pattern 'src/**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/Users/someuser/work/applications/frontend/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts ProjectRootPath: undefined
+		Projects: /Users/someuser/work/applications/frontend/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/Users/someuser/work/applications/frontend/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts ProjectRootPath: undefined
+		Projects: /Users/someuser/work/applications/frontend/tsconfig.json
+fileExists:: [{"key":"/Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts","count":1}]
+directoryExists:: [{"key":"/Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts","count":1}]
+getDirectories:: []
+readFile:: [{"key":"/Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts","count":1}]
+readDirectory:: []
+FileWatcher:: Close:: WatchInfo: /Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts 500 undefined WatchType: Closed Script info
+Search path: /Users/someuser/work/applications/frontend/src/app/utils
+For info: /Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts :: Config file name: /Users/someuser/work/applications/frontend/tsconfig.json
+Project '/Users/someuser/work/applications/frontend/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /Users/someuser/work/applications/frontend/src/app/utils/Analytic.ts ProjectRootPath: undefined
+		Projects: /Users/someuser/work/applications/frontend/tsconfig.json
+	FileName: /Users/someuser/work/applications/frontend/src/app/utils/Cookie.ts ProjectRootPath: undefined
+		Projects: /Users/someuser/work/applications/frontend/tsconfig.json
+fileExists:: []
+directoryExists:: []
+getDirectories:: []
+readFile:: []
+readDirectory:: []
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-calling-goto-definition-of-module.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-calling-goto-definition-of-module.js
new file mode 100644
index 0000000000000..e895586cd4a35
--- /dev/null
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/when-calling-goto-definition-of-module.js
@@ -0,0 +1,86 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/a/b/controllers/vessels/client.ts"}}
+Search path: /a/b/controllers/vessels
+For info: /a/b/controllers/vessels/client.ts :: Config file name: /a/b/tsconfig.json
+Creating configuration project /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/controllers/vessels/client.ts",
+  "/a/b/models/vessel.ts",
+  "/a/b/utils/db.ts"
+ ],
+ "options": {
+  "target": 2,
+  "module": 5,
+  "baseUrl": "/a/b",
+  "paths": {
+   "~/*": [
+    "*"
+   ]
+  },
+  "pathsBasePath": "/a/b",
+  "configFilePath": "/a/b/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/models/vessel.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/b/utils/db.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.es6.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/b/utils/db.ts
+	/a/b/models/vessel.ts
+	/a/b/controllers/vessels/client.ts
+
+
+	utils/db.ts
+	  Imported via '~/utils/db' from file 'models/vessel.ts'
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	models/vessel.ts
+	  Imported via '~/models/vessel' from file 'controllers/vessels/client.ts'
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	controllers/vessels/client.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/controllers/vessels/client.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"definition","arguments":{"file":"/a/b/controllers/vessels/client.ts","position":54}}
+response:{"response":[{"file":"/a/b/models/vessel.ts","start":{"line":2,"offset":21},"end":{"line":4,"offset":17}}],"responseRequired":true}
+fileExists:: []
+directoryExists:: []
+getDirectories:: []
+readFile:: []
+readDirectory:: []
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/a/b/models/vessel.ts"}}
+FileWatcher:: Close:: WatchInfo: /a/b/models/vessel.ts 500 undefined WatchType: Closed Script info
+Search path: /a/b/models
+For info: /a/b/models/vessel.ts :: Config file name: /a/b/tsconfig.json
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/controllers/vessels/client.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/b/models/vessel.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+response:{"responseRequired":false}
+fileExists:: [{"key":"/a/b/models/tsconfig.json","count":1},{"key":"/a/b/models/jsconfig.json","count":1}]
+directoryExists:: []
+getDirectories:: []
+readFile:: []
+readDirectory:: []
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/works-using-legacy-resolution-logic.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/works-using-legacy-resolution-logic.js
new file mode 100644
index 0000000000000..36d082cf22a45
--- /dev/null
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/works-using-legacy-resolution-logic.js
@@ -0,0 +1,108 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /c/d
+For info: /c/d/f0.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: /c/f1.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /c/d 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /c/d 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /c/d/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /c/d/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/c/f1.ts
+	/c/d/f0.ts
+
+
+	../f1.ts
+	  Imported via "f1" from file 'f0.ts'
+	f0.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /c/d/f0.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+getSemanticDiagnostics:: /c/f1.ts:: 1
+../f1.ts(1,1): error TS2304: Cannot find name 'foo'.
+
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+getSemanticDiagnostics:: /c/f1.ts:: 1
+../f1.ts(1,1): error TS2304: Cannot find name 'foo'.
+
+fileExists:: []
+directoryExists:: []
+getDirectories:: []
+readFile:: []
+readDirectory:: []
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+DirectoryWatcher:: Added:: WatchInfo: /c/d/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /c/d/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 3 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (1)
+	/c/d/f0.ts
+
+
+	f0.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Could not find source file: '/c/f1.ts'.
+fileExists:: [{"key":"/c/d/f2.ts","count":1},{"key":"/c/d/f2.tsx","count":1},{"key":"/c/d/f2.d.ts","count":1},{"key":"/c/f2.ts","count":1},{"key":"/c/f2.tsx","count":1},{"key":"/c/f2.d.ts","count":1},{"key":"/f2.ts","count":1},{"key":"/f2.tsx","count":1},{"key":"/f2.d.ts","count":1},{"key":"/c/d/f2.js","count":1},{"key":"/c/d/f2.jsx","count":1},{"key":"/c/f2.js","count":1},{"key":"/c/f2.jsx","count":1},{"key":"/f2.js","count":1},{"key":"/f2.jsx","count":1}]
+directoryExists:: [{"key":"/c/d","count":2},{"key":"/c","count":2},{"key":"/","count":2},{"key":"/c/d/node_modules","count":1},{"key":"/c/node_modules","count":1},{"key":"/node_modules","count":1},{"key":"/c/d/node_modules/@types","count":1},{"key":"/c/node_modules/@types","count":1},{"key":"/node_modules/@types","count":1}]
+getDirectories:: []
+readFile:: []
+readDirectory:: []
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+DirectoryWatcher:: Close:: WatchInfo: /c/d/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /c/d/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 4 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/c/f1.ts
+	/c/d/f0.ts
+
+
+	../f1.ts
+	  Imported via "f1" from file 'f0.ts'
+	f0.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+getSemanticDiagnostics:: /c/f1.ts:: 1
+../f1.ts(1,1): error TS2304: Cannot find name 'foo'.
+
+fileExists:: [{"key":"/c/d/f1.ts","count":1},{"key":"/c/d/f1.tsx","count":1},{"key":"/c/d/f1.d.ts","count":1},{"key":"/c/f1.ts","count":1}]
+directoryExists:: [{"key":"/c/d","count":1},{"key":"/c","count":1},{"key":"/c/d/node_modules/@types","count":1},{"key":"/c/node_modules/@types","count":1},{"key":"/node_modules/@types","count":1}]
+getDirectories:: []
+readFile:: []
+readDirectory:: []
+DirectoryWatcher:: Close:: WatchInfo: /c/d 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /c/d 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /c/d/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /c/d/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Scheduled: /dev/null/inferredProject1*
+Scheduled: *ensureProjectForOpenFiles*
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+DirectoryWatcher:: Added:: WatchInfo: /c/d 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /c/d 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /c/d/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /c/d/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 5 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Different program with same set of files
+getSemanticDiagnostics:: /c/f1.ts:: 1
+../f1.ts(1,1): error TS2304: Cannot find name 'foo'.
+
+fileExists:: [{"key":"/c/d/f1.ts","count":1},{"key":"/c/d/f1.tsx","count":1},{"key":"/c/d/f1.d.ts","count":1},{"key":"/c/f1.ts","count":1}]
+directoryExists:: [{"key":"/c/d","count":1},{"key":"/c","count":1},{"key":"/c/d/node_modules/@types","count":1},{"key":"/c/node_modules/@types","count":1},{"key":"/node_modules/@types","count":1}]
+getDirectories:: []
+readFile:: []
+readDirectory:: []
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again-2.js b/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again-2.js
new file mode 100644
index 0000000000000..7d86f8c8f013e
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again-2.js
@@ -0,0 +1,101 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/b/projects/project/src
+For info: /a/b/projects/project/src/file1.ts :: Config file name: /a/b/projects/project/src/tsconfig.json
+Creating configuration project /a/b/projects/project/src/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Config file
+Config: /a/b/projects/project/src/tsconfig.json : {
+ "rootNames": [
+  "/a/b/projects/project/src/file1.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/projects/project/src/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src 1 undefined Config: /a/b/projects/project/src/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src 1 undefined Config: /a/b/projects/project/src/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /a/b/projects/project/src/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/projects/project/src/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/projects/project/src/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/file1.ts
+
+
+	../../../../lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/projects/project/src/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/projects/project/src/file1.ts ProjectRootPath: /a/b/projects/project
+		Projects: /a/b/projects/project/src/tsconfig.json
+FileWatcher:: Triggered with /a/b/projects/project/src/tsconfig.json 2:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Config file
+`remove Project::
+Project '/a/b/projects/project/src/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/file1.ts
+
+
+	../../../../lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/src 1 undefined Config: /a/b/projects/project/src/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/src 1 undefined Config: /a/b/projects/project/src/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+Search path: /a/b/projects/project/src
+For info: /a/b/projects/project/src/file1.ts :: No config files found.
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /a/b/projects/project/src/tsconfig.json 2:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Config file
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Open files: 
+	FileName: /a/b/projects/project/src/file1.ts ProjectRootPath: /a/b/projects/project
+		Projects: 
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/src/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/file1.ts
+
+
+	../../../lib/lib.d.ts
+	  Default library for target 'es5'
+	src/file1.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+After ensureProjectForOpenFiles:
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/projects/project/src/file1.ts ProjectRootPath: /a/b/projects/project
+		Projects: /dev/null/inferredProject1*
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again.js b/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again.js
new file mode 100644
index 0000000000000..910a76be33ae1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configFileSearch/should-use-projectRootPath-when-searching-for-inferred-project-again.js
@@ -0,0 +1,103 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/b/projects/project/src
+For info: /a/b/projects/project/src/file1.ts :: Config file name: /a/b/projects/project/src/tsconfig.json
+Creating configuration project /a/b/projects/project/src/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Config file
+Config: /a/b/projects/project/src/tsconfig.json : {
+ "rootNames": [
+  "/a/b/projects/project/src/file1.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/projects/project/src/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src 1 undefined Config: /a/b/projects/project/src/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src 1 undefined Config: /a/b/projects/project/src/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /a/b/projects/project/src/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/projects/project/src/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/projects/project/src/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/file1.ts
+
+
+	../../../../lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/projects/project/src/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/projects/project/src/file1.ts ProjectRootPath: /a/b/projects/project
+		Projects: /a/b/projects/project/src/tsconfig.json
+FileWatcher:: Triggered with /a/b/projects/project/src/tsconfig.json 2:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Config file
+`remove Project::
+Project '/a/b/projects/project/src/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/file1.ts
+
+
+	../../../../lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/src 1 undefined Config: /a/b/projects/project/src/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/src 1 undefined Config: /a/b/projects/project/src/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Type roots
+Search path: /a/b/projects/project/src
+For info: /a/b/projects/project/src/file1.ts :: No config files found.
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /a/b/projects/project/src/tsconfig.json 2:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined Project: /a/b/projects/project/src/tsconfig.json WatchType: Config file
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Open files: 
+	FileName: /a/b/projects/project/src/file1.ts ProjectRootPath: /a/b/projects/project
+		Projects: 
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/src/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/file1.ts
+
+
+	../../../../lib/lib.d.ts
+	  Default library for target 'es5'
+	file1.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+After ensureProjectForOpenFiles:
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/projects/project/src/file1.ts ProjectRootPath: /a/b/projects/project
+		Projects: /dev/null/inferredProject1*
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-does-not-exist.js b/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-does-not-exist.js
new file mode 100644
index 0000000000000..35b4348a09223
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-does-not-exist.js
@@ -0,0 +1,164 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/b/projects/project/src
+For info: /a/b/projects/project/src/index.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/src/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/index.ts
+
+
+	../../../../lib/lib.d.ts
+	  Default library for target 'es5'
+	index.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
+		Projects: /dev/null/inferredProject1*
+FileWatcher:: Triggered with /a/b/projects/project/tsconfig.json 0:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Search path: /a/b/projects/project/src
+For info: /a/b/projects/project/src/index.ts :: Config file name: /a/b/projects/project/tsconfig.json
+Creating configuration project /a/b/projects/project/tsconfig.json
+Scheduled: /a/b/projects/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /a/b/projects/project/tsconfig.json 0:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Running: /a/b/projects/project/tsconfig.json
+Loading configured project /a/b/projects/project/tsconfig.json
+Config: /a/b/projects/project/tsconfig.json : {
+ "rootNames": [
+  "/a/b/projects/project/src/index.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/projects/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project 1 undefined Config: /a/b/projects/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project 1 undefined Config: /a/b/projects/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Close:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Close:: WatchInfo: /a/b/projects/project/src/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Close:: WatchInfo: /a/b/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /a/b/projects/project/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/projects/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/projects/project/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/index.ts
+
+
+	../../../lib/lib.d.ts
+	  Default library for target 'es3'
+	src/index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/a/b/projects/project/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
+		Projects: /a/b/projects/project/tsconfig.json
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+
+
+-----------------------------------------------
+After ensureProjectForOpenFiles:
+Project '/a/b/projects/project/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
+		Projects: /a/b/projects/project/tsconfig.json
+FileWatcher:: Triggered with /a/b/projects/project/tsconfig.json 2:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+`remove Project::
+Project '/a/b/projects/project/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/index.ts
+
+
+	../../../lib/lib.d.ts
+	  Default library for target 'es3'
+	src/index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project 1 undefined Config: /a/b/projects/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project 1 undefined Config: /a/b/projects/project/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Type roots
+Search path: /a/b/projects/project/src
+For info: /a/b/projects/project/src/index.ts :: No config files found.
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /a/b/projects/project/tsconfig.json 2:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
+		Projects: 
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/src/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/index.ts
+
+
+	../../../../lib/lib.d.ts
+	  Default library for target 'es5'
+	index.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+After ensureProjectForOpenFiles:
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
+		Projects: /dev/null/inferredProject1*
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-exists.js b/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-exists.js
new file mode 100644
index 0000000000000..da71bffadbbf7
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configFileSearch/tsconfig-for-the-file-exists.js
@@ -0,0 +1,171 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/b/projects/project/src
+For info: /a/b/projects/project/src/index.ts :: Config file name: /a/b/projects/project/tsconfig.json
+Creating configuration project /a/b/projects/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Config file
+Config: /a/b/projects/project/tsconfig.json : {
+ "rootNames": [
+  "/a/b/projects/project/src/index.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/projects/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project 1 undefined Config: /a/b/projects/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project 1 undefined Config: /a/b/projects/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /a/b/projects/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/projects/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/projects/project/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/index.ts
+
+
+	../../../lib/lib.d.ts
+	  Default library for target 'es3'
+	src/index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/projects/project/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
+		Projects: /a/b/projects/project/tsconfig.json
+FileWatcher:: Triggered with /a/b/projects/project/tsconfig.json 2:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Config file
+`remove Project::
+Project '/a/b/projects/project/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/index.ts
+
+
+	../../../lib/lib.d.ts
+	  Default library for target 'es3'
+	src/index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project 1 undefined Config: /a/b/projects/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project 1 undefined Config: /a/b/projects/project/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Type roots
+Search path: /a/b/projects/project/src
+For info: /a/b/projects/project/src/index.ts :: No config files found.
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /a/b/projects/project/tsconfig.json 2:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Config file
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Open files: 
+	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
+		Projects: 
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/src/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /a/b/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/index.ts
+
+
+	../../../../lib/lib.d.ts
+	  Default library for target 'es5'
+	index.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+After ensureProjectForOpenFiles:
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
+		Projects: /dev/null/inferredProject1*
+FileWatcher:: Triggered with /a/b/projects/project/tsconfig.json 0:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Search path: /a/b/projects/project/src
+For info: /a/b/projects/project/src/index.ts :: Config file name: /a/b/projects/project/tsconfig.json
+Creating configuration project /a/b/projects/project/tsconfig.json
+Scheduled: /a/b/projects/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /a/b/projects/project/tsconfig.json 0:: WatchInfo: /a/b/projects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Running: /a/b/projects/project/tsconfig.json
+Loading configured project /a/b/projects/project/tsconfig.json
+Config: /a/b/projects/project/tsconfig.json : {
+ "rootNames": [
+  "/a/b/projects/project/src/index.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/projects/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project 1 undefined Config: /a/b/projects/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project 1 undefined Config: /a/b/projects/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Close:: WatchInfo: /a/b/projects/project/src/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Close:: WatchInfo: /a/b/projects/project/src/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Close:: WatchInfo: /a/b/projects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /a/b/projects/project/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/projects/project/node_modules/@types 1 undefined Project: /a/b/projects/project/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/projects/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/projects/project/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/projects/project/src/index.ts
+
+
+	../../../lib/lib.d.ts
+	  Default library for target 'es3'
+	src/index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/a/b/projects/project/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
+		Projects: /a/b/projects/project/tsconfig.json
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+
+
+-----------------------------------------------
+After ensureProjectForOpenFiles:
+Project '/a/b/projects/project/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/projects/project/src/index.ts ProjectRootPath: /a/b/projects/proj
+		Projects: /a/b/projects/project/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-not-present.js b/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-not-present.js
new file mode 100644
index 0000000000000..68d337ec4d52b
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-not-present.js
@@ -0,0 +1,38 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace
+For info: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js
+
+
+	../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	x.js
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-present-but-file-is-not-from-project-root.js b/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-present-but-file-is-not-from-project-root.js
new file mode 100644
index 0000000000000..c7e1fd602644b
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configFileSearch/when-projectRootPath-is-present-but-file-is-not-from-project-root.js
@@ -0,0 +1,38 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace
+For info: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/General/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /root/teams/VSCode68/Shared Documents/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js
+
+
+	../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	x.js
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /root/teams/VSCode68/Shared Documents/General/jt-ts-test-workspace/x.js ProjectRootPath: /a/b
+		Projects: /dev/null/inferredProject1*
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update.js b/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update.js
new file mode 100644
index 0000000000000..b581b386437c1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configuredProjects/Open-ref-of-configured-project-when-open-file-gets-added-to-the-project-as-part-of-configured-file-update.js
@@ -0,0 +1,374 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/b/src
+For info: /a/b/src/file1.ts :: Config file name: /a/b/tsconfig.json
+Creating configuration project /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/src/file1.ts",
+  "/a/b/file3.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/tsconfig.json"
+ }
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/file3.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (2)
+	/a/b/src/file1.ts
+	/a/b/file3.ts
+
+
+	src/file1.ts
+	  Part of 'files' list in tsconfig.json
+	file3.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/src/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+Search path: /a/b/src
+For info: /a/b/src/file2.ts :: Config file name: /a/b/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
+DirectoryWatcher:: Added:: WatchInfo: /a/b/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (1)
+	/a/b/src/file2.ts
+
+
+	file2.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/src/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/b/src/file2.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+FileWatcher:: Close:: WatchInfo: /a/b/file3.ts 500 undefined WatchType: Closed Script info
+Search path: /a/b
+For info: /a/b/file3.ts :: Config file name: /a/b/tsconfig.json
+Project '/a/b/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/src/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/b/src/file2.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /a/b/file3.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+Search path: /a
+For info: /a/file4.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject2*
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject2* WatchType: Missing file
+DirectoryWatcher:: Added:: WatchInfo: /a/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject2* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (1)
+	/a/file4.ts
+
+
+	file4.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/src/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/b/src/file2.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /a/b/file3.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/file4.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject2*
+FileWatcher:: Triggered with /a/b/tsconfig.json 1:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+Scheduled: /a/b/tsconfig.json
+Search path: /a/b/src
+For info: /a/b/src/file2.ts :: Config file name: /a/b/tsconfig.json
+Scheduled: /a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /a/b/tsconfig.json 1:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+Running: /a/b/tsconfig.json
+Reloading configured project /a/b/tsconfig.json
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/file3.ts",
+  "/a/b/src/file1.ts",
+  "/a/b/src/file2.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/b/src/file1.ts
+	/a/b/file3.ts
+	/a/b/src/file2.ts
+
+
+	src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file3.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	src/file2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/src/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/b/src/file2.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/b/file3.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/file4.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject2*
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+
+
+-----------------------------------------------
+After ensureProjectForOpenFiles:
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/src/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/b/src/file2.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/b/file3.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/file4.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject2*
+FileWatcher:: Added:: WatchInfo: /a/b/src/file1.ts 500 undefined WatchType: Closed Script info
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/src/file2.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/b/file3.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/file4.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject2*
+FileWatcher:: Added:: WatchInfo: /a/b/src/file2.ts 500 undefined WatchType: Closed Script info
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/file3.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/file4.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject2*
+FileWatcher:: Added:: WatchInfo: /a/file4.ts 500 undefined WatchType: Closed Script info
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/file3.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /a/file4.ts 500 undefined WatchType: Closed Script info
+Search path: /a
+For info: /a/file4.ts :: No config files found.
+Starting updateGraphWorker: Project: /dev/null/inferredProject2*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject2* Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (1)
+	/a/file4.ts
+
+
+	file4.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+`remove Project::
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /a/b/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/file3.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/file4.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject2*
+FileWatcher:: Added:: WatchInfo: /a/b/file3.ts 500 undefined WatchType: Closed Script info
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/file4.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject2*
+Search path: /
+For info: /file5.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject3*
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject3* WatchType: Missing file
+Finishing updateGraphWorker: Project: /dev/null/inferredProject3* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject3*' (Inferred)
+	Files (1)
+	/file5.ts
+
+
+	file5.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+`remove Project::
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/b/src/file1.ts
+	/a/b/file3.ts
+	/a/b/src/file2.ts
+
+
+	src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file3.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	src/file2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
+FileWatcher:: Close:: WatchInfo: /a/b/src/file1.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /a/b/file3.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /a/b/src/file2.ts 500 undefined WatchType: Closed Script info
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject3*' (Inferred)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/file4.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject2*
+	FileName: /file5.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject3*
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js b/tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js
new file mode 100644
index 0000000000000..626fade0584b1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configuredProjects/add-and-then-remove-a-config-file-in-a-folder-with-loose-files.js
@@ -0,0 +1,208 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject
+For info: /user/username/projects/myproject/commonFile1.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/commonFile1.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	commonFile1.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/commonFile1.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+Search path: /user/username/projects/myproject
+For info: /user/username/projects/myproject/commonFile2.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject2*
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /dev/null/inferredProject2* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject2* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/commonFile2.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	commonFile2.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/commonFile1.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /user/username/projects/myproject/commonFile2.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject2*
+FileWatcher:: Triggered with /user/username/projects/myproject/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Search path: /user/username/projects/myproject
+For info: /user/username/projects/myproject/commonFile1.ts :: Config file name: /user/username/projects/myproject/tsconfig.json
+Creating configuration project /user/username/projects/myproject/tsconfig.json
+Scheduled: /user/username/projects/myproject/tsconfig.json
+Search path: /user/username/projects/myproject
+For info: /user/username/projects/myproject/commonFile2.ts :: Config file name: /user/username/projects/myproject/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Running: /user/username/projects/myproject/tsconfig.json
+Loading configured project /user/username/projects/myproject/tsconfig.json
+Config: /user/username/projects/myproject/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/commonFile1.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+ }
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/commonFile1.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	commonFile1.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/commonFile1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
+	FileName: /user/username/projects/myproject/commonFile2.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject2*
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+
+
+-----------------------------------------------
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/commonFile1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
+	FileName: /user/username/projects/myproject/commonFile2.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject2*
+FileWatcher:: Triggered with /user/username/projects/myproject/tsconfig.json 2:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+`remove Project::
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/commonFile1.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	commonFile1.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Search path: /user/username/projects/myproject
+For info: /user/username/projects/myproject/commonFile1.ts :: No config files found.
+Search path: /user/username/projects/myproject
+For info: /user/username/projects/myproject/commonFile2.ts :: No config files found.
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/tsconfig.json 2:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/commonFile1.ts ProjectRootPath: undefined
+		Projects: 
+	FileName: /user/username/projects/myproject/commonFile2.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject2*
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/commonFile1.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	commonFile1.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+After ensureProjectForOpenFiles:
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Project '/dev/null/inferredProject2*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/commonFile1.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /user/username/projects/myproject/commonFile2.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject2*
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configuredProjects/add-new-files-to-a-configured-project-without-file-list.js b/tests/baselines/reference/tsserver/configuredProjects/add-new-files-to-a-configured-project-without-file-list.js
new file mode 100644
index 0000000000000..6d0755811ca01
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configuredProjects/add-new-files-to-a-configured-project-without-file-list.js
@@ -0,0 +1,80 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/b
+For info: /a/b/commonFile1.ts :: Config file name: /a/b/tsconfig.json
+Creating configuration project /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/commonFile1.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/a/b/commonFile1.ts
+
+
+	../lib/lib.d.ts
+	  Default library for target 'es3'
+	commonFile1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/commonFile1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+DirectoryWatcher:: Triggered with /a/b/commonFile2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Scheduled: /a/b/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/commonFile2.ts :: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Running: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/commonFile2.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/b/commonFile1.ts
+	/a/b/commonFile2.ts
+
+
+	../lib/lib.d.ts
+	  Default library for target 'es3'
+	commonFile1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	commonFile2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/commonFile1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/commonFile1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configuredProjects/changed-module-resolution-reflected-when-specifying-files-list.js b/tests/baselines/reference/tsserver/configuredProjects/changed-module-resolution-reflected-when-specifying-files-list.js
new file mode 100644
index 0000000000000..2b7321d7fc5b8
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configuredProjects/changed-module-resolution-reflected-when-specifying-files-list.js
@@ -0,0 +1,102 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/b
+For info: /a/b/file1.ts :: Config file name: /a/b/tsconfig.json
+Creating configuration project /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/file1.ts"
+ ],
+ "options": {
+  "module": 2,
+  "configFilePath": "/a/b/tsconfig.json"
+ }
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/file2.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/file2.ts
+	/a/b/file1.ts
+
+
+	../lib/lib.d.ts
+	  Default library for target 'es3'
+	../file2.ts
+	  Imported via "file2" from file 'file1.ts'
+	file1.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+DirectoryWatcher:: Triggered with /a/b/file2.ts :: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /a/b/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/file2.ts :: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
+Running: /a/b/tsconfig.jsonFailedLookupInvalidation
+Scheduled: /a/b/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Running: /a/b/tsconfig.json
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/file2.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Close:: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /a/b 0 undefined Project: /a/b/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/b/file2.ts
+	/a/b/file1.ts
+
+
+	../lib/lib.d.ts
+	  Default library for target 'es3'
+	file2.ts
+	  Imported via "file2" from file 'file1.ts'
+	file1.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /a/b/file2.ts 500 undefined WatchType: Closed Script info
+Search path: /a/b
+For info: /a/b/file2.ts :: Config file name: /a/b/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /a/file2.ts 500 undefined WatchType: Closed Script info
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+	FileName: /a/b/file2.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configuredProjects/create-configured-project-with-the-file-list.js b/tests/baselines/reference/tsserver/configuredProjects/create-configured-project-with-the-file-list.js
new file mode 100644
index 0000000000000..bec97a5031503
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configuredProjects/create-configured-project-with-the-file-list.js
@@ -0,0 +1,45 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/b
+For info: /a/b/f1.ts :: Config file name: /a/b/tsconfig.json
+Creating configuration project /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/f1.ts",
+  "/a/b/f2.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b 0 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 0 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/f2.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/b/f1.ts
+	/a/b/f2.ts
+
+
+	../lib/lib.d.ts
+	  Default library for target 'es3'
+	f1.ts
+	  Matched by include pattern '*.ts' in 'tsconfig.json'
+	f2.ts
+	  Matched by include pattern '*.ts' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/f1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configuredProjects/create-configured-project-without-file-list.js b/tests/baselines/reference/tsserver/configuredProjects/create-configured-project-without-file-list.js
new file mode 100644
index 0000000000000..a34f6d2ce7cd3
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configuredProjects/create-configured-project-without-file-list.js
@@ -0,0 +1,45 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/b/c
+For info: /a/b/c/f1.ts :: Config file name: /a/b/tsconfig.json
+Creating configuration project /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/c/f1.ts",
+  "/a/b/d/f2.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/d/f2.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/b/c/f1.ts
+	/a/b/d/f2.ts
+
+
+	../lib/lib.d.ts
+	  Default library for target 'es3'
+	c/f1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	d/f2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/c/f1.ts ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configuredProjects/failed-lookup-locations-uses-parent-most-node_modules-directory.js b/tests/baselines/reference/tsserver/configuredProjects/failed-lookup-locations-uses-parent-most-node_modules-directory.js
new file mode 100644
index 0000000000000..d77b425cb7ee4
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configuredProjects/failed-lookup-locations-uses-parent-most-node_modules-directory.js
@@ -0,0 +1,54 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/rootfolder/a/b/src
+For info: /user/username/rootfolder/a/b/src/file1.ts :: Config file name: /user/username/rootfolder/a/b/src/tsconfig.json
+Creating configuration project /user/username/rootfolder/a/b/src/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/rootfolder/a/b/src/tsconfig.json 2000 undefined Project: /user/username/rootfolder/a/b/src/tsconfig.json WatchType: Config file
+Config: /user/username/rootfolder/a/b/src/tsconfig.json : {
+ "rootNames": [
+  "/user/username/rootfolder/a/b/src/file1.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/rootfolder/a/b/src/tsconfig.json"
+ }
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/rootfolder/a/b/src/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/a/b/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/a/b/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/a/b/src/node_modules 1 undefined Project: /user/username/rootfolder/a/b/src/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/a/b/src/node_modules 1 undefined Project: /user/username/rootfolder/a/b/src/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/a/b/src/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/a/b/src/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/a/b/src/node_modules/@types 1 undefined Project: /user/username/rootfolder/a/b/src/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/a/b/src/node_modules/@types 1 undefined Project: /user/username/rootfolder/a/b/src/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/a/b/src/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/a/b/src/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/a/node_modules/@types 1 undefined Project: /user/username/rootfolder/a/b/src/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/a/node_modules/@types 1 undefined Project: /user/username/rootfolder/a/b/src/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/rootfolder/a/b/src/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/rootfolder/a/b/src/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/rootfolder/a/b/node_modules/module2/index.d.ts
+	/user/username/rootfolder/a/b/node_modules/module1/index.d.ts
+	/user/username/rootfolder/a/b/src/file1.ts
+
+
+	../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../node_modules/module2/index.d.ts
+	  Imported via "module2" from file '../node_modules/module1/index.d.ts'
+	../node_modules/module1/index.d.ts
+	  Imported via "module1" from file 'file1.ts'
+	file1.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Project '/user/username/rootfolder/a/b/src/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/a/b/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/a/b/src/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configuredProjects/should-stop-watching-the-extended-configs-of-closed-projects.js b/tests/baselines/reference/tsserver/configuredProjects/should-stop-watching-the-extended-configs-of-closed-projects.js
new file mode 100644
index 0000000000000..27a3f71418fff
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configuredProjects/should-stop-watching-the-extended-configs-of-closed-projects.js
@@ -0,0 +1,249 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/a
+For info: /user/username/projects/myproject/a/a.ts :: Config file name: /user/username/projects/myproject/a/tsconfig.json
+Creating configuration project /user/username/projects/myproject/a/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/a.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/extended/alpha.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Extended config file
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/a/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Missing file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/node_modules/@types 1 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/node_modules/@types 1 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/a/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+	/user/username/projects/myproject/a/a.ts
+
+
+	a.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+Search path: /user/username/projects/myproject/b
+For info: /user/username/projects/myproject/b/b.ts :: Config file name: /user/username/projects/myproject/b/tsconfig.json
+Creating configuration project /user/username/projects/myproject/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/b.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/extended/bravo.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Extended config file
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Missing file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/node_modules/@types 1 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/node_modules/@types 1 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+	/user/username/projects/myproject/b/b.ts
+
+
+	b.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/b/tsconfig.json
+Search path: /user/username/projects/myproject/dummy
+For info: /user/username/projects/myproject/dummy/dummy.ts :: Config file name: /user/username/projects/myproject/dummy/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dummy/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dummy/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dummy/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dummy/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dummy/dummy.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/dummy/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dummy 1 undefined Config: /user/username/projects/myproject/dummy/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dummy 1 undefined Config: /user/username/projects/myproject/dummy/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dummy/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /user/username/projects/myproject/dummy/tsconfig.json WatchType: Missing file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dummy/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dummy/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dummy/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dummy/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dummy/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dummy/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dummy/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dummy/tsconfig.json' (Configured)
+	Files (1)
+	/user/username/projects/myproject/dummy/dummy.ts
+
+
+	dummy.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dummy/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/b/tsconfig.json
+	FileName: /user/username/projects/myproject/dummy/dummy.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dummy/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/b.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dummy/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+	FileName: /user/username/projects/myproject/dummy/dummy.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dummy/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dummy/dummy.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dummy/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dummy/dummy.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dummy
+For info: /user/username/projects/myproject/dummy/dummy.ts :: Config file name: /user/username/projects/myproject/dummy/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+	/user/username/projects/myproject/b/b.ts
+
+
+	b.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/extended/bravo.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Extended config file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b/node_modules/@types 1 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b/node_modules/@types 1 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Missing file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b/b.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dummy/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+	FileName: /user/username/projects/myproject/dummy/dummy.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dummy/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/a.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dummy/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dummy/dummy.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dummy/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dummy/dummy.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dummy/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dummy/dummy.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dummy
+For info: /user/username/projects/myproject/dummy/dummy.ts :: Config file name: /user/username/projects/myproject/dummy/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+	/user/username/projects/myproject/a/a.ts
+
+
+	a.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/extended/alpha.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Extended config file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a/node_modules/@types 1 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a/node_modules/@types 1 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Missing file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a/a.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dummy/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dummy/dummy.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dummy/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/configuredProjects/should-watch-the-extended-configs-of-multiple-projects.js b/tests/baselines/reference/tsserver/configuredProjects/should-watch-the-extended-configs-of-multiple-projects.js
new file mode 100644
index 0000000000000..89ac3fa2e3082
--- /dev/null
+++ b/tests/baselines/reference/tsserver/configuredProjects/should-watch-the-extended-configs-of-multiple-projects.js
@@ -0,0 +1,306 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/a
+For info: /user/username/projects/myproject/a/a.ts :: Config file name: /user/username/projects/myproject/a/tsconfig.json
+Creating configuration project /user/username/projects/myproject/a/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/a.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/extended/alpha.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Extended config file
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/a/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Missing file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/node_modules/@types 1 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/node_modules/@types 1 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/a/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/a/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+	/user/username/projects/myproject/a/a.ts
+
+
+	a.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+Search path: /user/username/projects/myproject/b
+For info: /user/username/projects/myproject/b/b.ts :: Config file name: /user/username/projects/myproject/b/tsconfig.json
+Creating configuration project /user/username/projects/myproject/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/b.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/extended/bravo.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Extended config file
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Missing file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/node_modules/@types 1 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/node_modules/@types 1 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+	/user/username/projects/myproject/b/b.ts
+
+
+	b.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/b/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/extended/alpha.tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/extended/alpha.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Extended config file
+Scheduled: /user/username/projects/myproject/a/tsconfig.json
+Scheduled: /user/username/projects/myproject/b/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/extended/alpha.tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/extended/alpha.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Extended config file
+Running: /user/username/projects/myproject/a/tsconfig.json
+Reloading configured project /user/username/projects/myproject/a/tsconfig.json
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/a.ts"
+ ],
+ "options": {
+  "strict": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/a/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/a/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: /user/username/projects/myproject/b/tsconfig.json
+Reloading configured project /user/username/projects/myproject/b/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/b.ts"
+ ],
+ "options": {
+  "strict": true,
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ }
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/b/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/b/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/b/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/b/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/extended/bravo.tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/extended/bravo.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Extended config file
+Scheduled: /user/username/projects/myproject/b/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/extended/bravo.tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/extended/bravo.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Extended config file
+Running: /user/username/projects/myproject/b/tsconfig.json
+Reloading configured project /user/username/projects/myproject/b/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/b.ts"
+ ],
+ "options": {
+  "strict": false,
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ }
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/b/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/b/tsconfig.json Version: 3 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/b/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/b/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/b/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/b/tsconfig.json WatchType: Config file
+Running: /user/username/projects/myproject/b/tsconfig.json
+Reloading configured project /user/username/projects/myproject/b/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/b.ts"
+ ],
+ "options": {
+  "strict": true,
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ }
+}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/extended/bravo.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Extended config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/b/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/b/tsconfig.json Version: 4 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/b/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/b/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/extended/alpha.tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/extended/alpha.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Extended config file
+Scheduled: /user/username/projects/myproject/a/tsconfig.json
+Scheduled: /user/username/projects/myproject/b/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/extended/alpha.tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/extended/alpha.tsconfig.json 2000 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Extended config file
+Running: /user/username/projects/myproject/a/tsconfig.json
+Reloading configured project /user/username/projects/myproject/a/tsconfig.json
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/a.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/a/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/a/tsconfig.json Version: 3 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: /user/username/projects/myproject/b/tsconfig.json
+Reloading configured project /user/username/projects/myproject/b/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/b.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ }
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/b/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/b/tsconfig.json Version: 5 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/b/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/a/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a/a.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/a/tsconfig.json
+	FileName: /user/username/projects/myproject/b/b.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/b/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/inferredProjects/create-inferred-project.js b/tests/baselines/reference/tsserver/inferredProjects/create-inferred-project.js
new file mode 100644
index 0000000000000..ea4dc80f7cc99
--- /dev/null
+++ b/tests/baselines/reference/tsserver/inferredProjects/create-inferred-project.js
@@ -0,0 +1,36 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject
+For info: /user/username/projects/myproject/app.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/module.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/module.d.ts
+	/user/username/projects/myproject/app.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	module.d.ts
+	  Imported via "./module" from file 'app.ts'
+	app.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/app.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-module-specifiers-when-changes-happen-in-contained-node_modules-directories.js b/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-module-specifiers-when-changes-happen-in-contained-node_modules-directories.js
new file mode 100644
index 0000000000000..a5365671bef02
--- /dev/null
+++ b/tests/baselines/reference/tsserver/moduleSpecifierCache/invalidates-module-specifiers-when-changes-happen-in-contained-node_modules-directories.js
@@ -0,0 +1,150 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/src/a.ts"}}
+Search path: /src
+For info: /src/a.ts :: Config file name: /tsconfig.json
+Creating configuration project /tsconfig.json
+FileWatcher:: Added:: WatchInfo: /tsconfig.json 2000 undefined Project: /tsconfig.json WatchType: Config file
+Config: /tsconfig.json : {
+ "rootNames": [
+  "/src/a.ts",
+  "/src/ambient.d.ts",
+  "/src/b-link.ts",
+  "/src/b.ts",
+  "/src/c.ts"
+ ],
+ "options": {
+  "configFilePath": "/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /src 1 undefined Config: /tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /src 1 undefined Config: /tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /src/ambient.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /src/b-link.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /src/b.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /src/c.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /tsconfig.json WatchType: Missing file
+Finishing updateGraphWorker: Project: /tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/tsconfig.json' (Configured)
+	Files (5)
+	/src/a.ts
+	/src/ambient.d.ts
+	/src/b-link.ts
+	/src/b.ts
+	/src/c.ts
+
+
+	src/a.ts
+	  Matched by include pattern 'src' in 'tsconfig.json'
+	src/ambient.d.ts
+	  Matched by include pattern 'src' in 'tsconfig.json'
+	src/b-link.ts
+	  Matched by include pattern 'src' in 'tsconfig.json'
+	src/b.ts
+	  Matched by include pattern 'src' in 'tsconfig.json'
+	src/c.ts
+	  Matched by include pattern 'src' in 'tsconfig.json'
+
+-----------------------------------------------
+FileWatcher:: Added:: WatchInfo: /package.json 250 undefined WatchType: package.json file
+AutoImportProviderProject: found 1 root files in 1 dependencies in * ms
+DirectoryWatcher:: Added:: WatchInfo: /node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Starting updateGraphWorker: Project: /dev/null/autoImportProviderProject1*
+Finishing updateGraphWorker: Project: /dev/null/autoImportProviderProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/autoImportProviderProject1*' (AutoImportProvider)
+	Files (1)
+	/node_modules/mobx/index.d.ts
+
+
+	node_modules/mobx/index.d.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Project '/dev/null/autoImportProviderProject1*' (AutoImportProvider)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /src/a.ts ProjectRootPath: undefined
+		Projects: /tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/src/b.ts"}}
+FileWatcher:: Close:: WatchInfo: /src/b.ts 500 undefined WatchType: Closed Script info
+Search path: /src
+For info: /src/b.ts :: Config file name: /tsconfig.json
+Project '/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Project '/dev/null/autoImportProviderProject1*' (AutoImportProvider)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /src/a.ts ProjectRootPath: undefined
+		Projects: /tsconfig.json
+	FileName: /src/b.ts ProjectRootPath: undefined
+		Projects: /tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/src/c.ts"}}
+FileWatcher:: Close:: WatchInfo: /src/c.ts 500 undefined WatchType: Closed Script info
+Search path: /src
+For info: /src/c.ts :: Config file name: /tsconfig.json
+Project '/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Project '/dev/null/autoImportProviderProject1*' (AutoImportProvider)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /src/a.ts ProjectRootPath: undefined
+		Projects: /tsconfig.json
+	FileName: /src/b.ts ProjectRootPath: undefined
+		Projects: /tsconfig.json
+	FileName: /src/c.ts ProjectRootPath: undefined
+		Projects: /tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"configure","arguments":{"preferences":{"includeCompletionsForImportStatements":true,"includeCompletionsForModuleExports":true,"includeCompletionsWithInsertText":true,"includeCompletionsWithSnippetText":true}}}
+response:
+    {"seq":0,"type":"response","command":"configure","request_seq":0,"success":true,"performanceData":{"updateGraphDurationMs":*,"createAutoImportProviderProgramDurationMs":*}}
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"completionInfo","arguments":{"file":"/src/b.ts","line":1,"offset":3}}
+getCompletionData: Get current token: *
+getCompletionData: Is inside comment: *
+getCompletionData: Get previous token: *
+getExportInfoMap: cache miss or empty; calculating new results
+forEachExternalModuleToImportFrom autoImportProvider: *
+getExportInfoMap: done in * ms
+collectAutoImports: resolved 0 module specifiers, plus 0 ambient and 1 from cache
+collectAutoImports: response is incomplete
+collectAutoImports: *
+getCompletionData: Semantic work: *
+getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
+response:{"response":{"flags":1,"isGlobalCompletion":true,"isMemberCompletion":false,"isNewIdentifierLocation":false,"optionalReplacementSpan":{"start":{"line":1,"offset":1},"end":{"line":1,"offset":4}},"entries":[{"name":"abstract","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"any","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"as","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"asserts","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"async","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"await","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"bigint","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"boolean","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"break","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"case","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"catch","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"class","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"const","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"continue","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"debugger","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"declare","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"default","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"delete","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"do","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"else","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"enum","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"export","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"extends","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"false","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"finally","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"for","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"function","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"globalThis","kind":"module","kindModifiers":"","sortText":"15"},{"name":"if","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"implements","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"import","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"in","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"infer","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"instanceof","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"interface","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"keyof","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"let","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"module","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"namespace","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"never","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"new","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"null","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"number","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"object","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"package","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"readonly","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"return","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"string","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"super","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"switch","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"symbol","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"this","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"throw","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"true","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"try","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"type","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"typeof","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"undefined","kind":"var","kindModifiers":"","sortText":"15"},{"name":"unique","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"unknown","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"var","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"void","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"while","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"with","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"yield","kind":"keyword","kindModifiers":"","sortText":"15"},{"name":"foo","kind":"const","kindModifiers":"export","sortText":"16","hasAction":true,"source":"/src/a","data":{"exportName":"foo","exportMapKey":"foo|*|","fileName":"/src/a.ts"}}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"completionInfo","arguments":{"file":"/src/c.ts","line":1,"offset":8}}
+getCompletionData: Get current token: *
+getCompletionData: Is inside comment: *
+getCompletionData: Get previous token: *
+getExportInfoMap: cache miss or empty; calculating new results
+forEachExternalModuleToImportFrom autoImportProvider: *
+getExportInfoMap: done in * ms
+collectAutoImports: resolved 2 module specifiers, plus 0 ambient and 0 from cache
+collectAutoImports: response is complete
+collectAutoImports: *
+getCompletionData: Semantic work: *
+getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
+response:{"response":{"flags":11,"isGlobalCompletion":false,"isMemberCompletion":false,"isNewIdentifierLocation":true,"entries":[{"name":"foo","kind":"const","kindModifiers":"export","sortText":"11","insertText":"import { foo$1 } from \"./a\";","replacementSpan":{"start":{"line":1,"offset":1},"end":{"line":1,"offset":7}},"isSnippet":true,"source":"./a","sourceDisplay":[{"text":"./a","kind":"text"}],"isImportStatementCompletion":true,"data":{"exportName":"foo","moduleSpecifier":"./a","fileName":"/src/a.ts"}},{"name":"observable","kind":"function","kindModifiers":"export,declare","sortText":"11","insertText":"import { observable$1 } from \"mobx\";","replacementSpan":{"start":{"line":1,"offset":1},"end":{"line":1,"offset":7}},"isSnippet":true,"source":"mobx","sourceDisplay":[{"text":"mobx","kind":"text"}],"isPackageJsonImport":true,"isImportStatementCompletion":true,"data":{"exportName":"observable","moduleSpecifier":"mobx","fileName":"/node_modules/mobx/index.d.ts","isPackageJsonImport":true}},{"name":"type","kind":"keyword","kindModifiers":"","sortText":"15"}]},"responseRequired":true}
+DirectoryWatcher:: Triggered with /node_modules/.staging :: WatchInfo: /node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Triggered with /node_modules/.staging :: WatchInfo: /node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+DirectoryWatcher:: Triggered with /node_modules/.staging/mobx-12345678 :: WatchInfo: /node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Triggered with /node_modules/.staging/mobx-12345678 :: WatchInfo: /node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+DirectoryWatcher:: Triggered with /node_modules/.staging/mobx-12345678/package.json :: WatchInfo: /node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Triggered with /node_modules/.staging/mobx-12345678/package.json :: WatchInfo: /node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/partialSemanticServer/files-are-added-to-inferred-project.js b/tests/baselines/reference/tsserver/partialSemanticServer/files-are-added-to-inferred-project.js
new file mode 100644
index 0000000000000..d10e85a9eb97d
--- /dev/null
+++ b/tests/baselines/reference/tsserver/partialSemanticServer/files-are-added-to-inferred-project.js
@@ -0,0 +1,69 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/a.ts"}}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a.ts
+
+
+	a/lib/lib.d.ts
+	  Default library for target 'es5'
+	user/username/projects/myproject/a.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
+request:{"command":"completions","arguments":{"file":"/user/username/projects/myproject/a.ts","line":3,"offset":47},"seq":1,"type":"request"}
+getCompletionData: Get current token: *
+getCompletionData: Is inside comment: *
+getCompletionData: Get previous token: *
+getCompletionsAtPosition: isCompletionListBlocker: *
+getCompletionData: Semantic work: *
+getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
+response:{"response":[{"name":"foo","kind":"method","kindModifiers":"","sortText":"11"},{"name":"prop","kind":"property","kindModifiers":"","sortText":"11"}],"responseRequired":true}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/b.ts"}}
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a.ts
+	/user/username/projects/myproject/b.ts
+
+
+	a/lib/lib.d.ts
+	  Default library for target 'es5'
+	user/username/projects/myproject/a.ts
+	  Root file specified for compilation
+	user/username/projects/myproject/b.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /user/username/projects/myproject/b.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
+request:{"command":"completions","arguments":{"file":"/user/username/projects/myproject/a.ts","line":3,"offset":47},"seq":2,"type":"request"}
+getCompletionData: Get current token: *
+getCompletionData: Is inside comment: *
+getCompletionData: Get previous token: *
+getCompletionsAtPosition: isCompletionListBlocker: *
+getCompletionData: Semantic work: *
+getCompletionsAtPosition: getCompletionEntriesFromSymbols: *
+response:{"response":[{"name":"foo","kind":"method","kindModifiers":"","sortText":"11"},{"name":"prop","kind":"property","kindModifiers":"","sortText":"11"}],"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/partialSemanticServer/should-not-crash-when-external-module-name-resolution-is-reused.js b/tests/baselines/reference/tsserver/partialSemanticServer/should-not-crash-when-external-module-name-resolution-is-reused.js
new file mode 100644
index 0000000000000..7d89d1c90f111
--- /dev/null
+++ b/tests/baselines/reference/tsserver/partialSemanticServer/should-not-crash-when-external-module-name-resolution-is-reused.js
@@ -0,0 +1,83 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/a.ts"}}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a.ts
+
+
+	a/lib/lib.d.ts
+	  Default library for target 'es5'
+	user/username/projects/myproject/a.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/a.ts"}}
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/c.ts"}}
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/c.ts
+
+
+	a/lib/lib.d.ts
+	  Default library for target 'es5'
+	user/username/projects/myproject/c.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/b.ts"}}
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/c.ts
+	/user/username/projects/myproject/b.ts
+
+
+	a/lib/lib.d.ts
+	  Default library for target 'es5'
+	user/username/projects/myproject/c.ts
+	  Root file specified for compilation
+	user/username/projects/myproject/b.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /user/username/projects/myproject/b.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/partialSemanticServer/should-not-include-auto-type-reference-directives.js b/tests/baselines/reference/tsserver/partialSemanticServer/should-not-include-auto-type-reference-directives.js
new file mode 100644
index 0000000000000..6b7f28524708b
--- /dev/null
+++ b/tests/baselines/reference/tsserver/partialSemanticServer/should-not-include-auto-type-reference-directives.js
@@ -0,0 +1,25 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/a.ts"}}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a.ts
+
+
+	a/lib/lib.d.ts
+	  Default library for target 'es5'
+	user/username/projects/myproject/a.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/partialSemanticServer/should-not-include-referenced-files-from-unopened-files.js b/tests/baselines/reference/tsserver/partialSemanticServer/should-not-include-referenced-files-from-unopened-files.js
new file mode 100644
index 0000000000000..6b7f28524708b
--- /dev/null
+++ b/tests/baselines/reference/tsserver/partialSemanticServer/should-not-include-referenced-files-from-unopened-files.js
@@ -0,0 +1,25 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/a.ts"}}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a.ts
+
+
+	a/lib/lib.d.ts
+	  Default library for target 'es5'
+	user/username/projects/myproject/a.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/partialSemanticServer/should-support-go-to-definition-on-module-specifiers.js b/tests/baselines/reference/tsserver/partialSemanticServer/should-support-go-to-definition-on-module-specifiers.js
new file mode 100644
index 0000000000000..d6aaf791e059b
--- /dev/null
+++ b/tests/baselines/reference/tsserver/partialSemanticServer/should-support-go-to-definition-on-module-specifiers.js
@@ -0,0 +1,27 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/a.ts"}}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a.ts
+
+
+	a/lib/lib.d.ts
+	  Default library for target 'es5'
+	user/username/projects/myproject/a.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/a.ts","line":1,"offset":23},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/b.ts","start":{"line":1,"offset":1},"end":{"line":1,"offset":1}}],"textSpan":{"start":{"line":1,"offset":23},"end":{"line":1,"offset":28}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/partialSemanticServer/throws-unsupported-commands.js b/tests/baselines/reference/tsserver/partialSemanticServer/throws-unsupported-commands.js
new file mode 100644
index 0000000000000..eafc354cc19b1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/partialSemanticServer/throws-unsupported-commands.js
@@ -0,0 +1,28 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/a.ts"}}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a.ts
+
+
+	a/lib/lib.d.ts
+	  Default library for target 'es5'
+	user/username/projects/myproject/a.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
+request:{"type":"request","seq":1,"command":"semanticDiagnosticsSync","arguments":{"file":"/user/username/projects/myproject/a.ts"}}
+Request: semanticDiagnosticsSync not allowed in LanguageServiceMode.PartialSemantic
+LanguageService Operation: getSemanticDiagnostics not allowed in LanguageServiceMode.PartialSemantic
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..6cca71de75ce1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
@@ -0,0 +1,147 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/dependency/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes.js
new file mode 100644
index 0000000000000..a7b3a5ebb87d3
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-changes.js
@@ -0,0 +1,117 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-created.js
new file mode 100644
index 0000000000000..44101745a05d1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-created.js
@@ -0,0 +1,212 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-deleted.js
new file mode 100644
index 0000000000000..7a50814caed25
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-deleted.js
@@ -0,0 +1,212 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-not-present.js
new file mode 100644
index 0000000000000..820786dc0e9db
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dts-not-present.js
@@ -0,0 +1,200 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..8cb7f5890c737
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -0,0 +1,147 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/dependency/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes.js
new file mode 100644
index 0000000000000..06c16fbcd0c0f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-changes.js
@@ -0,0 +1,117 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-created.js
new file mode 100644
index 0000000000000..03aec560a0c17
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-created.js
@@ -0,0 +1,212 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-deleted.js
new file mode 100644
index 0000000000000..28a68c844c4ec
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-deleted.js
@@ -0,0 +1,212 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-not-present.js
new file mode 100644
index 0000000000000..e0dd0554916d1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/dependency-dtsMap-not-present.js
@@ -0,0 +1,202 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/rename-locations.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/rename-locations.js
new file mode 100644
index 0000000000000..a9593545baeeb
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/rename-locations.js
@@ -0,0 +1,202 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..6aab56efc888e
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes-with-timeout-before-request.js
@@ -0,0 +1,116 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":1,"endLine":6,"endOffset":1,"insertString":"const x = 10;"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":7,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes.js
new file mode 100644
index 0000000000000..6aab56efc888e
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configHasNoReference/usage-file-changes.js
@@ -0,0 +1,116 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":1,"endLine":6,"endOffset":1,"insertString":"const x = 10;"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":7,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..6cca71de75ce1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes-with-timeout-before-request.js
@@ -0,0 +1,147 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/dependency/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes.js
new file mode 100644
index 0000000000000..a7b3a5ebb87d3
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-changes.js
@@ -0,0 +1,117 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-created.js
new file mode 100644
index 0000000000000..44101745a05d1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-created.js
@@ -0,0 +1,212 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-deleted.js
new file mode 100644
index 0000000000000..7a50814caed25
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-deleted.js
@@ -0,0 +1,212 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-not-present.js
new file mode 100644
index 0000000000000..820786dc0e9db
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dts-not-present.js
@@ -0,0 +1,200 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..8cb7f5890c737
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -0,0 +1,147 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/dependency/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes.js
new file mode 100644
index 0000000000000..06c16fbcd0c0f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-changes.js
@@ -0,0 +1,117 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-created.js
new file mode 100644
index 0000000000000..03aec560a0c17
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-created.js
@@ -0,0 +1,212 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-deleted.js
new file mode 100644
index 0000000000000..28a68c844c4ec
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-deleted.js
@@ -0,0 +1,212 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-not-present.js
new file mode 100644
index 0000000000000..e0dd0554916d1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-dtsMap-not-present.js
@@ -0,0 +1,202 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..a5626995a154a
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes-with-timeout-before-request.js
@@ -0,0 +1,116 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":1,"endLine":1,"endOffset":1,"insertString":"function fooBar() { }\n"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":17},"seq":7,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":6,"offset":17},"end":{"line":6,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":6,"offset":17},"end":{"line":6,"offset":20},"contextStart":{"line":6,"offset":1},"contextEnd":{"line":6,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes.js
new file mode 100644
index 0000000000000..a5626995a154a
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/dependency-source-changes.js
@@ -0,0 +1,116 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":1,"endLine":1,"endOffset":1,"insertString":"function fooBar() { }\n"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":17},"seq":7,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":6,"offset":17},"end":{"line":6,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":6,"offset":17},"end":{"line":6,"offset":20},"contextStart":{"line":6,"offset":1},"contextEnd":{"line":6,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/rename-locations.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/rename-locations.js
new file mode 100644
index 0000000000000..a9593545baeeb
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/rename-locations.js
@@ -0,0 +1,202 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..6aab56efc888e
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes-with-timeout-before-request.js
@@ -0,0 +1,116 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":1,"endLine":6,"endOffset":1,"insertString":"const x = 10;"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":7,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes.js
new file mode 100644
index 0000000000000..6aab56efc888e
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/usage-file-changes.js
@@ -0,0 +1,116 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":1,"endLine":6,"endOffset":1,"insertString":"const x = 10;"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":7,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/when-projects-are-not-built.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/when-projects-are-not-built.js
new file mode 100644
index 0000000000000..820786dc0e9db
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/configWithReference/when-projects-are-not-built.js
@@ -0,0 +1,200 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..6cca71de75ce1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
@@ -0,0 +1,147 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/dependency/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes.js
new file mode 100644
index 0000000000000..a7b3a5ebb87d3
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-changes.js
@@ -0,0 +1,117 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-created.js
new file mode 100644
index 0000000000000..44101745a05d1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-created.js
@@ -0,0 +1,212 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-deleted.js
new file mode 100644
index 0000000000000..7a50814caed25
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-deleted.js
@@ -0,0 +1,212 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-not-present.js
new file mode 100644
index 0000000000000..820786dc0e9db
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dts-not-present.js
@@ -0,0 +1,200 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..8cb7f5890c737
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -0,0 +1,147 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/dependency/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes.js
new file mode 100644
index 0000000000000..06c16fbcd0c0f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-changes.js
@@ -0,0 +1,117 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-created.js
new file mode 100644
index 0000000000000..03aec560a0c17
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-created.js
@@ -0,0 +1,212 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-deleted.js
new file mode 100644
index 0000000000000..28a68c844c4ec
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-deleted.js
@@ -0,0 +1,212 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-not-present.js
new file mode 100644
index 0000000000000..e0dd0554916d1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/dependency-dtsMap-not-present.js
@@ -0,0 +1,202 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/rename-locations.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/rename-locations.js
new file mode 100644
index 0000000000000..a9593545baeeb
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/rename-locations.js
@@ -0,0 +1,202 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":3,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..6aab56efc888e
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
@@ -0,0 +1,116 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":1,"endLine":6,"endOffset":1,"insertString":"const x = 10;"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":7,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes.js
new file mode 100644
index 0000000000000..6aab56efc888e
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependency/disabledSourceRef/usage-file-changes.js
@@ -0,0 +1,116 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":1,"endLine":6,"endOffset":1,"insertString":"const x = 10;"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":4,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":5,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":7,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..e5276ef39a4ac
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
@@ -0,0 +1,252 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/main/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: /user/username/projects/myproject/dependency/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes.js
new file mode 100644
index 0000000000000..d91a5061d905b
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-changes.js
@@ -0,0 +1,209 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-created.js
new file mode 100644
index 0000000000000..899d84de05b8a
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-created.js
@@ -0,0 +1,381 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/main/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-deleted.js
new file mode 100644
index 0000000000000..298133cfc003b
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-deleted.js
@@ -0,0 +1,371 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/main/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-not-present.js
new file mode 100644
index 0000000000000..29adb50945d28
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dts-not-present.js
@@ -0,0 +1,333 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":6,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":7,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":8,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":9,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":10,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..642837c2eb98a
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -0,0 +1,251 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/dependency/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: /user/username/projects/myproject/main/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes.js
new file mode 100644
index 0000000000000..7d6876a183335
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-changes.js
@@ -0,0 +1,208 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-created.js
new file mode 100644
index 0000000000000..0808f76c13174
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-created.js
@@ -0,0 +1,369 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":1,"offset":25},"end":{"line":1,"offset":28},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":37}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-deleted.js
new file mode 100644
index 0000000000000..21a4ad15cd714
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-deleted.js
@@ -0,0 +1,361 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":1,"offset":25},"end":{"line":1,"offset":28},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":37}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":2,"offset":25},"end":{"line":2,"offset":28},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":37}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":3,"offset":25},"end":{"line":3,"offset":28},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":37}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":4,"offset":25},"end":{"line":4,"offset":28},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":37}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":5,"offset":25},"end":{"line":5,"offset":28},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":37}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-not-present.js
new file mode 100644
index 0000000000000..c1962787bc501
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/dependency-dtsMap-not-present.js
@@ -0,0 +1,341 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":1,"offset":25},"end":{"line":1,"offset":28},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":37}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":2,"offset":25},"end":{"line":2,"offset":28},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":37}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":3,"offset":25},"end":{"line":3,"offset":28},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":37}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":4,"offset":25},"end":{"line":4,"offset":28},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":37}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":5,"offset":25},"end":{"line":5,"offset":28},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":37}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":7,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":8,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":9,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":10,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/goToDef-and-rename-locations.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/goToDef-and-rename-locations.js
new file mode 100644
index 0000000000000..702e1a01a78d1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/goToDef-and-rename-locations.js
@@ -0,0 +1,351 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":6,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":7,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":8,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..46cb935585a76
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes-with-timeout-before-request.js
@@ -0,0 +1,208 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":14,"offset":1,"endLine":14,"endOffset":1,"insertString":"const x = 10;"},"seq":3,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":1,"endLine":6,"endOffset":1,"insertString":"const x = 10;"},"seq":4,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":5,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":8,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":9,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":10,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":13,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":14,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes.js
new file mode 100644
index 0000000000000..46cb935585a76
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configHasNoReference/usage-file-changes.js
@@ -0,0 +1,208 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":14,"offset":1,"endLine":14,"endOffset":1,"insertString":"const x = 10;"},"seq":3,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":1,"endLine":6,"endOffset":1,"insertString":"const x = 10;"},"seq":4,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":5,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":8,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":9,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":10,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":13,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":14,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..7ee43fc60ff0c
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes-with-timeout-before-request.js
@@ -0,0 +1,259 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/main/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: /user/username/projects/myproject/dependency/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes.js
new file mode 100644
index 0000000000000..1238f3d8b61b9
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-changes.js
@@ -0,0 +1,216 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-created.js
new file mode 100644
index 0000000000000..aceca98d664f3
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-created.js
@@ -0,0 +1,376 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/main/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-deleted.js
new file mode 100644
index 0000000000000..3310ab7f7b42c
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-deleted.js
@@ -0,0 +1,380 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/main/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-not-present.js
new file mode 100644
index 0000000000000..5dabfb6c0dc4c
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dts-not-present.js
@@ -0,0 +1,357 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":6,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":7,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":8,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..2bee0db7dbc54
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -0,0 +1,259 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/main/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: /user/username/projects/myproject/dependency/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes.js
new file mode 100644
index 0000000000000..1623ee9b82c98
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-changes.js
@@ -0,0 +1,216 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-created.js
new file mode 100644
index 0000000000000..107df168e142a
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-created.js
@@ -0,0 +1,379 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-deleted.js
new file mode 100644
index 0000000000000..cd69e4d4a47ba
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-deleted.js
@@ -0,0 +1,379 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-not-present.js
new file mode 100644
index 0000000000000..cb3c9f47788c7
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-dtsMap-not-present.js
@@ -0,0 +1,359 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":6,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":7,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":8,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..5e549ee3ba0a2
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes-with-timeout-before-request.js
@@ -0,0 +1,214 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":1,"endLine":1,"endOffset":1,"insertString":"function fooBar() { }\n"},"seq":3,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":4,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":8,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":6,"offset":17},"end":{"line":6,"offset":20},"contextStart":{"line":6,"offset":1},"contextEnd":{"line":6,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":17},"seq":13,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":6,"offset":17},"end":{"line":6,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":6,"offset":17},"end":{"line":6,"offset":20},"contextStart":{"line":6,"offset":1},"contextEnd":{"line":6,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes.js
new file mode 100644
index 0000000000000..64f18f2793aba
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/dependency-source-changes.js
@@ -0,0 +1,214 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":1,"endLine":1,"endOffset":1,"insertString":"function fooBar() { }\n "},"seq":3,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":4,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":18},"end":{"line":2,"offset":21},"contextStart":{"line":2,"offset":2},"contextEnd":{"line":2,"offset":27}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":8,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":6,"offset":17},"end":{"line":6,"offset":20},"contextStart":{"line":6,"offset":1},"contextEnd":{"line":6,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":18},"end":{"line":2,"offset":21}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":18},"end":{"line":2,"offset":21},"contextStart":{"line":2,"offset":2},"contextEnd":{"line":2,"offset":27}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":17},"seq":13,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":6,"offset":17},"end":{"line":6,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":6,"offset":17},"end":{"line":6,"offset":20},"contextStart":{"line":6,"offset":1},"contextEnd":{"line":6,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/gotoDef-and-rename-locations.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/gotoDef-and-rename-locations.js
new file mode 100644
index 0000000000000..1f4effc7476da
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/gotoDef-and-rename-locations.js
@@ -0,0 +1,359 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":6,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":7,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":8,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..948d53ce98eec
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes-with-timeout-before-request.js
@@ -0,0 +1,216 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":14,"offset":1,"endLine":14,"endOffset":1,"insertString":"const x = 10;"},"seq":3,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":1,"endLine":6,"endOffset":1,"insertString":"const x = 10;"},"seq":4,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":5,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":8,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":9,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":10,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":13,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":14,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes.js
new file mode 100644
index 0000000000000..948d53ce98eec
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/usage-file-changes.js
@@ -0,0 +1,216 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":14,"offset":1,"endLine":14,"endOffset":1,"insertString":"const x = 10;"},"seq":3,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":1,"endLine":6,"endOffset":1,"insertString":"const x = 10;"},"seq":4,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":5,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":8,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":9,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":10,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":13,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":14,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/when-projects-are-not-built.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/when-projects-are-not-built.js
new file mode 100644
index 0000000000000..5dabfb6c0dc4c
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/configWithReference/when-projects-are-not-built.js
@@ -0,0 +1,357 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":6,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":7,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":8,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json,/user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..998750416c36f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
@@ -0,0 +1,259 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/main/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: /user/username/projects/myproject/dependency/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes.js
new file mode 100644
index 0000000000000..b8551a9002215
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-changes.js
@@ -0,0 +1,216 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-created.js
new file mode 100644
index 0000000000000..9d5ba6ca0c1fc
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-created.js
@@ -0,0 +1,388 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/main/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-deleted.js
new file mode 100644
index 0000000000000..d785c3ba86e0e
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-deleted.js
@@ -0,0 +1,378 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/main/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-not-present.js
new file mode 100644
index 0000000000000..af9bf69993aac
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dts-not-present.js
@@ -0,0 +1,340 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":6,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":7,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":8,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":9,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":10,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts 2000 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Missing generated file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..b29831a251ac0
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -0,0 +1,258 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/dependency/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: /user/username/projects/myproject/main/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes.js
new file mode 100644
index 0000000000000..f6365e0d94974
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-changes.js
@@ -0,0 +1,215 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-created.js
new file mode 100644
index 0000000000000..ef312d8ebdf6d
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-created.js
@@ -0,0 +1,376 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":1,"offset":25},"end":{"line":1,"offset":28},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":37}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-deleted.js
new file mode 100644
index 0000000000000..535f95191701d
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-deleted.js
@@ -0,0 +1,368 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/dependency/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":1,"offset":25},"end":{"line":1,"offset":28},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":37}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":2,"offset":25},"end":{"line":2,"offset":28},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":37}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":3,"offset":25},"end":{"line":3,"offset":28},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":37}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":4,"offset":25},"end":{"line":4,"offset":28},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":37}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":5,"offset":25},"end":{"line":5,"offset":28},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":37}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":8,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":9,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":10,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":11,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":12,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-not-present.js
new file mode 100644
index 0000000000000..7a4e4260ecb82
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/dependency-dtsMap-not-present.js
@@ -0,0 +1,348 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":1,"offset":25},"end":{"line":1,"offset":28},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":37}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":2,"offset":25},"end":{"line":2,"offset":28},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":37}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":3,"offset":25},"end":{"line":3,"offset":28},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":37}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":4,"offset":25},"end":{"line":4,"offset":28},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":37}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":5,"offset":25},"end":{"line":5,"offset":28},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":37}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":6,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":7,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":8,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":9,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":10,"type":"request"}
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/gotoDef-and-rename-locations.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/gotoDef-and-rename-locations.js
new file mode 100644
index 0000000000000..c3f2ee1b879c9
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/gotoDef-and-rename-locations.js
@@ -0,0 +1,358 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":6,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":7,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":8,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":9,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":10,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+`remove Project::
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..73f22b35ad21b
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
@@ -0,0 +1,215 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":14,"offset":1,"endLine":14,"endOffset":1,"insertString":"const x = 10;"},"seq":3,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":1,"endLine":6,"endOffset":1,"insertString":"const x = 10;"},"seq":4,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":5,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":8,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":9,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":10,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":13,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":14,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes.js
new file mode 100644
index 0000000000000..73f22b35ad21b
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/dependencyAndUsage/disabledSourceRef/usage-file-changes.js
@@ -0,0 +1,215 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts"}}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+Creating configuration project /user/username/projects/myproject/dependency/tsconfig.json
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	FnS.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/dependency/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/dependency/FnS.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/dependency/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":2,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":14,"offset":1,"endLine":14,"endOffset":1,"insertString":"const x = 10;"},"seq":3,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":6,"offset":1,"endLine":6,"endOffset":1,"insertString":"const x = 10;"},"seq":4,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":5,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":8,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":9,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":1,"offset":17},"seq":10,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/dependency/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn1","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn1","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":2,"offset":17},"seq":11,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn2","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn2","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":3,"offset":17},"seq":12,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn3","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn3","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":4,"offset":17},"seq":13,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn4","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn4","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}]}]},"responseRequired":true}
+request:{"command":"rename","arguments":{"file":"/user/username/projects/myproject/dependency/FnS.ts","line":5,"offset":17},"seq":14,"type":"request"}
+Search path: /user/username/projects/myproject/dependency
+For info: /user/username/projects/myproject/dependency/FnS.ts :: Config file name: /user/username/projects/myproject/dependency/tsconfig.json
+response:{"response":{"info":{"canRename":true,"displayName":"fn5","fullDisplayName":"\"/user/username/projects/myproject/dependency/FnS\".fn5","kind":"function","kindModifiers":"export","triggerSpan":{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20}}},"locs":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","locs":[{"start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}]},{"file":"/user/username/projects/myproject/main/main.ts","locs":[{"start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}},{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}]}]},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/can-go-to-definition-correctly.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/can-go-to-definition-correctly.js
new file mode 100644
index 0000000000000..5d5514d0baeb3
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/can-go-to-definition-correctly.js
@@ -0,0 +1,213 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..e2e52e1a31b08
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes-with-timeout-before-request.js
@@ -0,0 +1,153 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/main/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes.js
new file mode 100644
index 0000000000000..6741893f75020
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-changes.js
@@ -0,0 +1,123 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-created.js
new file mode 100644
index 0000000000000..9e374d9bea865
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-created.js
@@ -0,0 +1,233 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/main/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+Scheduled: *ensureProjectForOpenFiles*
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-deleted.js
new file mode 100644
index 0000000000000..730eda05271cc
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-deleted.js
@@ -0,0 +1,233 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/main/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-not-present.js
new file mode 100644
index 0000000000000..a50f356b59122
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dts-not-present.js
@@ -0,0 +1,201 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..c5626dcf780a1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -0,0 +1,152 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/main/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes.js
new file mode 100644
index 0000000000000..9ca36bc74e7fe
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-changes.js
@@ -0,0 +1,122 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-created.js
new file mode 100644
index 0000000000000..e2680a624f837
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-created.js
@@ -0,0 +1,225 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":1,"offset":25},"end":{"line":1,"offset":28},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":37}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-deleted.js
new file mode 100644
index 0000000000000..645ed8c6e57fd
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-deleted.js
@@ -0,0 +1,225 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":1,"offset":25},"end":{"line":1,"offset":28},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":37}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":2,"offset":25},"end":{"line":2,"offset":28},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":37}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":3,"offset":25},"end":{"line":3,"offset":28},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":37}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":4,"offset":25},"end":{"line":4,"offset":28},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":37}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":5,"offset":25},"end":{"line":5,"offset":28},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":37}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-not-present.js
new file mode 100644
index 0000000000000..557217be21b6e
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/dependency-dtsMap-not-present.js
@@ -0,0 +1,211 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":1,"offset":25},"end":{"line":1,"offset":28},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":37}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":2,"offset":25},"end":{"line":2,"offset":28},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":37}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":3,"offset":25},"end":{"line":3,"offset":28},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":37}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":4,"offset":25},"end":{"line":4,"offset":28},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":37}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":5,"offset":25},"end":{"line":5,"offset":28},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":37}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..14d2c404938da
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes-with-timeout-before-request.js
@@ -0,0 +1,121 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":14,"offset":1,"endLine":14,"endOffset":1,"insertString":"const x = 10;"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes.js
new file mode 100644
index 0000000000000..14d2c404938da
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configHasNoReference/usage-file-changes.js
@@ -0,0 +1,121 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":14,"offset":1,"endLine":14,"endOffset":1,"insertString":"const x = 10;"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/can-go-to-definition-correctly.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/can-go-to-definition-correctly.js
new file mode 100644
index 0000000000000..d135b7dcdd82c
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/can-go-to-definition-correctly.js
@@ -0,0 +1,232 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..e571f5f28b50a
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes-with-timeout-before-request.js
@@ -0,0 +1,134 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes.js
new file mode 100644
index 0000000000000..e571f5f28b50a
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-changes.js
@@ -0,0 +1,134 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-created.js
new file mode 100644
index 0000000000000..1a545665fbdcd
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-created.js
@@ -0,0 +1,237 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/main/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-deleted.js
new file mode 100644
index 0000000000000..1a545665fbdcd
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-deleted.js
@@ -0,0 +1,237 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/main/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-not-present.js
new file mode 100644
index 0000000000000..d135b7dcdd82c
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dts-not-present.js
@@ -0,0 +1,232 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..e571f5f28b50a
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -0,0 +1,134 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes.js
new file mode 100644
index 0000000000000..e571f5f28b50a
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-changes.js
@@ -0,0 +1,134 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-created.js
new file mode 100644
index 0000000000000..b5f3e8230f990
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-created.js
@@ -0,0 +1,236 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-deleted.js
new file mode 100644
index 0000000000000..b5f3e8230f990
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-deleted.js
@@ -0,0 +1,236 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-not-present.js
new file mode 100644
index 0000000000000..d135b7dcdd82c
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-dtsMap-not-present.js
@@ -0,0 +1,232 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..319ce5fda7ba5
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes-with-timeout-before-request.js
@@ -0,0 +1,171 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/dependency/FnS.ts 1:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/dependency/FnS.ts 1:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/main/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":6,"offset":17},"end":{"line":6,"offset":20},"contextStart":{"line":6,"offset":1},"contextEnd":{"line":6,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes.js
new file mode 100644
index 0000000000000..77d10eb76d38c
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/dependency-source-changes.js
@@ -0,0 +1,141 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/dependency/FnS.ts 1:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/dependency/FnS.ts 1:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":6,"offset":17},"end":{"line":6,"offset":20},"contextStart":{"line":6,"offset":1},"contextEnd":{"line":6,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..baa612da15bec
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes-with-timeout-before-request.js
@@ -0,0 +1,139 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":14,"offset":1,"endLine":14,"endOffset":1,"insertString":"const x = 10;"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes.js
new file mode 100644
index 0000000000000..baa612da15bec
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/usage-file-changes.js
@@ -0,0 +1,139 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":14,"offset":1,"endLine":14,"endOffset":1,"insertString":"const x = 10;"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/when-projects-are-not-built.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/when-projects-are-not-built.js
new file mode 100644
index 0000000000000..d135b7dcdd82c
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/configWithReference/when-projects-are-not-built.js
@@ -0,0 +1,232 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/dependency/FnS.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../dependency/FnS.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/can-go-to-definition-correctly.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/can-go-to-definition-correctly.js
new file mode 100644
index 0000000000000..6219f51c701ba
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/can-go-to-definition-correctly.js
@@ -0,0 +1,237 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..7251e16764c5b
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes-with-timeout-before-request.js
@@ -0,0 +1,174 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/main/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes.js
new file mode 100644
index 0000000000000..dac062562513f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-changes.js
@@ -0,0 +1,144 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 1:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-created.js
new file mode 100644
index 0000000000000..779a08f60654a
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-created.js
@@ -0,0 +1,257 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/main/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+Scheduled: *ensureProjectForOpenFiles*
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-deleted.js
new file mode 100644
index 0000000000000..04500365482f3
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-deleted.js
@@ -0,0 +1,257 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts 2:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/main/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-not-present.js
new file mode 100644
index 0000000000000..4f3949a07613e
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dts-not-present.js
@@ -0,0 +1,225 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":2,"offset":5},"end":{"line":2,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":3,"offset":5},"end":{"line":3,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":4,"offset":5},"end":{"line":4,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":5,"offset":5},"end":{"line":5,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/main/main.ts","start":{"line":6,"offset":5},"end":{"line":6,"offset":8},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":7,"offset":22}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..2319d5eb3c1c1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes-with-timeout-before-request.js
@@ -0,0 +1,173 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/main/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes.js
new file mode 100644
index 0000000000000..42169ba905a01
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-changes.js
@@ -0,0 +1,143 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 1:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-created.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-created.js
new file mode 100644
index 0000000000000..f33a86888145c
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-created.js
@@ -0,0 +1,249 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":1,"offset":25},"end":{"line":1,"offset":28},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":37}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 0:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-deleted.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-deleted.js
new file mode 100644
index 0000000000000..09b5a29245136
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-deleted.js
@@ -0,0 +1,249 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/main/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map 2:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/decls/FnS.d.ts.map :: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":2,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":1,"offset":25},"end":{"line":1,"offset":28},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":37}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":2,"offset":25},"end":{"line":2,"offset":28},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":37}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":3,"offset":25},"end":{"line":3,"offset":28},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":37}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":4,"offset":25},"end":{"line":4,"offset":28},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":37}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":5,"offset":25},"end":{"line":5,"offset":28},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":37}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-not-present.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-not-present.js
new file mode 100644
index 0000000000000..4e1b518b0c0e8
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/dependency-dtsMap-not-present.js
@@ -0,0 +1,235 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":1,"offset":25},"end":{"line":1,"offset":28},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":37}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":2,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":2,"offset":25},"end":{"line":2,"offset":28},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":37}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":3,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":3,"offset":25},"end":{"line":3,"offset":28},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":37}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":4,"offset":25},"end":{"line":4,"offset":28},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":37}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/decls/fns.d.ts","start":{"line":5,"offset":25},"end":{"line":5,"offset":28},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":37}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/random/random.ts 500 undefined WatchType: Closed Script info
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+`remove Project::
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/main/main.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 2000 undefined WatchType: Missing source map file
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes-with-timeout-before-request.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
new file mode 100644
index 0000000000000..57ae065331edd
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes-with-timeout-before-request.js
@@ -0,0 +1,142 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":14,"offset":1,"endLine":14,"endOffset":1,"insertString":"const x = 10;"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes.js b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes.js
new file mode 100644
index 0000000000000..57ae065331edd
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectReferencesSourcemap/usageProject/disabledSourceRef/usage-file-changes.js
@@ -0,0 +1,142 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/main/main.ts"}}
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/main.ts :: Config file name: /user/username/projects/myproject/main/tsconfig.json
+Creating configuration project /user/username/projects/myproject/main/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/main/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/main/main.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "disableSourceOfProjectReferenceRedirect": true,
+  "configFilePath": "/user/username/projects/myproject/main/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/dependency",
+   "originalPath": "../dependency"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main 1 undefined Config: /user/username/projects/myproject/main/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Config: /user/username/projects/myproject/dependency/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/dependency/FnS.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declarationMap": true,
+  "declarationDir": "/user/username/projects/myproject/decls",
+  "configFilePath": "/user/username/projects/myproject/dependency/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency 1 undefined Config: /user/username/projects/myproject/dependency/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/fns.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/main/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/decls/fns.d.ts
+	/user/username/projects/myproject/main/main.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../decls/fns.d.ts
+	  Imported via '../decls/fns' from file 'main.ts'
+	main.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Search path: /user/username/projects/myproject/main
+For info: /user/username/projects/myproject/main/tsconfig.json :: No config files found.
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/random/random.ts"}}
+Search path: /user/username/projects/myproject/random
+For info: /user/username/projects/myproject/random/random.ts :: Config file name: /user/username/projects/myproject/random/tsconfig.json
+Creating configuration project /user/username/projects/myproject/random/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/random/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/random/random.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/random/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random 1 undefined Config: /user/username/projects/myproject/random/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/random/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/random/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/random/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/random/random.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	random.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/main/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/random/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/main/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/main/tsconfig.json
+	FileName: /user/username/projects/myproject/random/random.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/random/tsconfig.json
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":1,"type":"request"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/decls/FnS.d.ts.map 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/dependency/FnS.ts 500 undefined WatchType: Closed Script info
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"change","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":14,"offset":1,"endLine":14,"endOffset":1,"insertString":"const x = 10;"},"seq":2,"type":"request"}
+response:{"responseRequired":false}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":9,"offset":1},"seq":3,"type":"request"}
+Starting updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/main/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":1,"offset":17},"end":{"line":1,"offset":20},"contextStart":{"line":1,"offset":1},"contextEnd":{"line":1,"offset":26}}],"textSpan":{"start":{"line":9,"offset":1},"end":{"line":9,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":10,"offset":1},"seq":4,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":2,"offset":17},"end":{"line":2,"offset":20},"contextStart":{"line":2,"offset":1},"contextEnd":{"line":2,"offset":26}}],"textSpan":{"start":{"line":10,"offset":1},"end":{"line":10,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":11,"offset":1},"seq":5,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":3,"offset":17},"end":{"line":3,"offset":20},"contextStart":{"line":3,"offset":1},"contextEnd":{"line":3,"offset":26}}],"textSpan":{"start":{"line":11,"offset":1},"end":{"line":11,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":12,"offset":1},"seq":6,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":4,"offset":17},"end":{"line":4,"offset":20},"contextStart":{"line":4,"offset":1},"contextEnd":{"line":4,"offset":26}}],"textSpan":{"start":{"line":12,"offset":1},"end":{"line":12,"offset":4}}},"responseRequired":true}
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/main/main.ts","line":13,"offset":1},"seq":7,"type":"request"}
+response:{"response":{"definitions":[{"file":"/user/username/projects/myproject/dependency/FnS.ts","start":{"line":5,"offset":17},"end":{"line":5,"offset":20},"contextStart":{"line":5,"offset":1},"contextEnd":{"line":5,"offset":26}}],"textSpan":{"start":{"line":13,"offset":1},"end":{"line":13,"offset":4}}},"responseRequired":true}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-at-root-level.js b/tests/baselines/reference/tsserver/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-at-root-level.js
new file mode 100644
index 0000000000000..5b239ec627f3f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-at-root-level.js
@@ -0,0 +1,73 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"command":"open","arguments":{"file":"/a/b/project/file1.ts"},"seq":1,"type":"request"}
+Search path: /a/b/project
+For info: /a/b/project/file1.ts :: Config file name: /a/b/project/tsconfig.json
+Creating configuration project /a/b/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/project/tsconfig.json 2000 undefined Project: /a/b/project/tsconfig.json WatchType: Config file
+Config: /a/b/project/tsconfig.json : {
+ "rootNames": [
+  "/a/b/project/file1.ts",
+  "/a/b/project/file3.ts"
+ ],
+ "options": {
+  "typeRoots": [],
+  "configFilePath": "/a/b/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b/project 1 undefined Config: /a/b/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/project 1 undefined Config: /a/b/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/project/node_modules 1 undefined Project: /a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/project/node_modules 1 undefined Project: /a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /a/b/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/b/project/file1.ts
+	/a/b/project/file3.ts
+
+
+	../../lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file3.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/project/tsconfig.json
+response:{"responseRequired":false}
+FileWatcher:: Triggered with /a/b/project/file3.ts 1:: WatchInfo: /a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Scheduled: /a/b/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /a/b/project/file3.ts 1:: WatchInfo: /a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Running: /a/b/project/tsconfig.json
+Starting updateGraphWorker: Project: /a/b/project/tsconfig.json
+Finishing updateGraphWorker: Project: /a/b/project/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/project/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/project/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-not-at-root-level.js b/tests/baselines/reference/tsserver/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-not-at-root-level.js
new file mode 100644
index 0000000000000..f7d5b06d246c3
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-not-at-root-level.js
@@ -0,0 +1,132 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"command":"open","arguments":{"file":"/user/username/rootfolder/otherfolder/a/b/project/file1.ts"},"seq":1,"type":"request"}
+Search path: /user/username/rootfolder/otherfolder/a/b/project
+For info: /user/username/rootfolder/otherfolder/a/b/project/file1.ts :: Config file name: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Creating configuration project /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json 2000 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Config file
+Config: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json : {
+ "rootNames": [
+  "/user/username/rootfolder/otherfolder/a/b/project/file1.ts",
+  "/user/username/rootfolder/otherfolder/a/b/project/file3.ts"
+ ],
+ "options": {
+  "typeRoots": [],
+  "configFilePath": "/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/rootfolder/otherfolder/a/b/project/file1.ts
+	/user/username/rootfolder/otherfolder/a/b/project/file3.ts
+
+
+	../../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file3.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+response:{"responseRequired":false}
+FileWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/project/file3.ts 1:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/project/file3.ts 1:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Running: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Running: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json Version: 3 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts
+	/user/username/rootfolder/otherfolder/a/b/project/file1.ts
+	/user/username/rootfolder/otherfolder/a/b/project/file3.ts
+
+
+	../../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../node_modules/file2.d.ts
+	  Imported via "file2" from file 'file1.ts'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file3.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js b/tests/baselines/reference/tsserver/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js
new file mode 100644
index 0000000000000..50cf6dc2dbd54
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js
@@ -0,0 +1,84 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"command":"open","arguments":{"file":"/a/b/project/file1.ts"},"seq":1,"type":"request"}
+Search path: /a/b/project
+For info: /a/b/project/file1.ts :: Config file name: /a/b/project/tsconfig.json
+Creating configuration project /a/b/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/project/tsconfig.json 2000 undefined Project: /a/b/project/tsconfig.json WatchType: Config file
+event:
+    {"seq":0,"type":"event","event":"projectLoadingStart","body":{"projectName":"/a/b/project/tsconfig.json","reason":"Creating possible configured project for /a/b/project/file1.ts to open"}}
+Config: /a/b/project/tsconfig.json : {
+ "rootNames": [
+  "/a/b/project/file1.ts",
+  "/a/b/project/file3.ts"
+ ],
+ "options": {
+  "typeRoots": [],
+  "configFilePath": "/a/b/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b/project 1 undefined Config: /a/b/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/project 1 undefined Config: /a/b/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/project/node_modules 1 undefined Project: /a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/project/node_modules 1 undefined Project: /a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /a/b/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/b/project/file1.ts
+	/a/b/project/file3.ts
+
+
+	../../lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file3.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+event:
+    {"seq":0,"type":"event","event":"projectLoadingFinish","body":{"projectName":"/a/b/project/tsconfig.json"}}
+event:
+    {"seq":0,"type":"event","event":"telemetry","body":{"telemetryEventName":"projectInfo","payload":{"projectId":"1cf2001c133ce00fd258494c136bfa9707203d90270d151ea0f575d93d990f9d","fileStats":{"js":0,"jsSize":0,"jsx":0,"jsxSize":0,"ts":2,"tsSize":39,"tsx":0,"tsxSize":0,"dts":1,"dtsSize":334,"deferred":0,"deferredSize":0},"compilerOptions":{"typeRoots":[]},"typeAcquisition":{"enable":false,"include":false,"exclude":false},"extends":false,"files":false,"include":false,"exclude":false,"compileOnSave":false,"configFileName":"tsconfig.json","projectType":"configured","languageServiceEnabled":true,"version":"FakeVersion"}}}
+event:
+    {"seq":0,"type":"event","event":"configFileDiag","body":{"triggerFile":"/a/b/project/file1.ts","configFile":"/a/b/project/tsconfig.json","diagnostics":[]}}
+Project '/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/project/tsconfig.json
+response:{"responseRequired":false}
+FileWatcher:: Triggered with /a/b/project/file3.ts 1:: WatchInfo: /a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Scheduled: /a/b/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /a/b/project/file3.ts 1:: WatchInfo: /a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Running: /a/b/project/tsconfig.json
+Starting updateGraphWorker: Project: /a/b/project/tsconfig.json
+Finishing updateGraphWorker: Project: /a/b/project/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/project/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/project/tsconfig.json
+got projects updated in background, updating diagnostics for /a/b/project/file1.ts
+event:
+    {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/project/file1.ts"]}}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js b/tests/baselines/reference/tsserver/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
new file mode 100644
index 0000000000000..0afb1f68ffb19
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
@@ -0,0 +1,146 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"command":"open","arguments":{"file":"/user/username/rootfolder/otherfolder/a/b/project/file1.ts"},"seq":1,"type":"request"}
+Search path: /user/username/rootfolder/otherfolder/a/b/project
+For info: /user/username/rootfolder/otherfolder/a/b/project/file1.ts :: Config file name: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Creating configuration project /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json 2000 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Config file
+event:
+    {"seq":0,"type":"event","event":"projectLoadingStart","body":{"projectName":"/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json","reason":"Creating possible configured project for /user/username/rootfolder/otherfolder/a/b/project/file1.ts to open"}}
+Config: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json : {
+ "rootNames": [
+  "/user/username/rootfolder/otherfolder/a/b/project/file1.ts",
+  "/user/username/rootfolder/otherfolder/a/b/project/file3.ts"
+ ],
+ "options": {
+  "typeRoots": [],
+  "configFilePath": "/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/rootfolder/otherfolder/a/b/project/file1.ts
+	/user/username/rootfolder/otherfolder/a/b/project/file3.ts
+
+
+	../../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file3.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+event:
+    {"seq":0,"type":"event","event":"projectLoadingFinish","body":{"projectName":"/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json"}}
+event:
+    {"seq":0,"type":"event","event":"telemetry","body":{"telemetryEventName":"projectInfo","payload":{"projectId":"79b1a0103ed8006f174a1f979cf698219d4ec4ae3a48594da1085f7a1749553c","fileStats":{"js":0,"jsSize":0,"jsx":0,"jsxSize":0,"ts":2,"tsSize":39,"tsx":0,"tsxSize":0,"dts":1,"dtsSize":334,"deferred":0,"deferredSize":0},"compilerOptions":{"typeRoots":[]},"typeAcquisition":{"enable":false,"include":false,"exclude":false},"extends":false,"files":false,"include":false,"exclude":false,"compileOnSave":false,"configFileName":"tsconfig.json","projectType":"configured","languageServiceEnabled":true,"version":"FakeVersion"}}}
+event:
+    {"seq":0,"type":"event","event":"configFileDiag","body":{"triggerFile":"/user/username/rootfolder/otherfolder/a/b/project/file1.ts","configFile":"/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json","diagnostics":[]}}
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+response:{"responseRequired":false}
+FileWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/project/file3.ts 1:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/project/file3.ts 1:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+got projects updated in background, updating diagnostics for /user/username/rootfolder/otherfolder/a/b/project/file1.ts
+event:
+    {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/rootfolder/otherfolder/a/b/project/file1.ts"]}}
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Running: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Running: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json Version: 3 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts
+	/user/username/rootfolder/otherfolder/a/b/project/file1.ts
+	/user/username/rootfolder/otherfolder/a/b/project/file3.ts
+
+
+	../../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../node_modules/file2.d.ts
+	  Imported via "file2" from file 'file1.ts'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file3.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+got projects updated in background, updating diagnostics for /user/username/rootfolder/otherfolder/a/b/project/file1.ts
+event:
+    {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/rootfolder/otherfolder/a/b/project/file1.ts"]}}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js b/tests/baselines/reference/tsserver/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js
new file mode 100644
index 0000000000000..66148720fc9fd
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-at-root-level.js
@@ -0,0 +1,86 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"command":"open","arguments":{"file":"/a/b/project/file1.ts"},"seq":1,"type":"request"}
+Search path: /a/b/project
+For info: /a/b/project/file1.ts :: Config file name: /a/b/project/tsconfig.json
+Creating configuration project /a/b/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/project/tsconfig.json 2000 undefined Project: /a/b/project/tsconfig.json WatchType: Config file
+event:
+    {"seq":0,"type":"event","event":"projectLoadingStart","body":{"projectName":"/a/b/project/tsconfig.json","reason":"Creating possible configured project for /a/b/project/file1.ts to open"}}
+Config: /a/b/project/tsconfig.json : {
+ "rootNames": [
+  "/a/b/project/file1.ts",
+  "/a/b/project/file3.ts"
+ ],
+ "options": {
+  "typeRoots": [],
+  "configFilePath": "/a/b/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b/project 1 undefined Config: /a/b/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/project 1 undefined Config: /a/b/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/project/node_modules 1 undefined Project: /a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/project/node_modules 1 undefined Project: /a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /a/b/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/b/project/file1.ts
+	/a/b/project/file3.ts
+
+
+	../../lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file3.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+event:
+    {"seq":0,"type":"event","event":"projectLoadingFinish","body":{"projectName":"/a/b/project/tsconfig.json"}}
+event:
+    {"seq":0,"type":"event","event":"telemetry","body":{"telemetryEventName":"projectInfo","payload":{"projectId":"1cf2001c133ce00fd258494c136bfa9707203d90270d151ea0f575d93d990f9d","fileStats":{"js":0,"jsSize":0,"jsx":0,"jsxSize":0,"ts":2,"tsSize":39,"tsx":0,"tsxSize":0,"dts":1,"dtsSize":334,"deferred":0,"deferredSize":0},"compilerOptions":{"typeRoots":[]},"typeAcquisition":{"enable":false,"include":false,"exclude":false},"extends":false,"files":false,"include":false,"exclude":false,"compileOnSave":false,"configFileName":"tsconfig.json","projectType":"configured","languageServiceEnabled":true,"version":"FakeVersion"}}}
+event:
+    {"seq":0,"type":"event","event":"configFileDiag","body":{"triggerFile":"/a/b/project/file1.ts","configFile":"/a/b/project/tsconfig.json","diagnostics":[]}}
+Project '/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/project/tsconfig.json
+response:{"responseRequired":false}
+FileWatcher:: Triggered with /a/b/project/file3.ts 1:: WatchInfo: /a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Scheduled: /a/b/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /a/b/project/file3.ts 1:: WatchInfo: /a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Running: /a/b/project/tsconfig.json
+Starting updateGraphWorker: Project: /a/b/project/tsconfig.json
+Finishing updateGraphWorker: Project: /a/b/project/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/project/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /a/b/project/tsconfig.json
+got projects updated in background, updating diagnostics for /a/b/project/file1.ts
+event:
+    {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/a/b/project/file1.ts"]}}
+event:
+    {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/a/b/project/file1.ts","diagnostics":[]}}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js b/tests/baselines/reference/tsserver/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
new file mode 100644
index 0000000000000..c8b66d92914f4
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
@@ -0,0 +1,145 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"command":"open","arguments":{"file":"/user/username/rootfolder/otherfolder/a/b/project/file1.ts"},"seq":1,"type":"request"}
+Search path: /user/username/rootfolder/otherfolder/a/b/project
+For info: /user/username/rootfolder/otherfolder/a/b/project/file1.ts :: Config file name: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Creating configuration project /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json 2000 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Config file
+event:
+    {"seq":0,"type":"event","event":"projectLoadingStart","body":{"projectName":"/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json","reason":"Creating possible configured project for /user/username/rootfolder/otherfolder/a/b/project/file1.ts to open"}}
+Config: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json : {
+ "rootNames": [
+  "/user/username/rootfolder/otherfolder/a/b/project/file1.ts",
+  "/user/username/rootfolder/otherfolder/a/b/project/file3.ts"
+ ],
+ "options": {
+  "typeRoots": [],
+  "configFilePath": "/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/user/username/rootfolder/otherfolder/a/b/project/file1.ts
+	/user/username/rootfolder/otherfolder/a/b/project/file3.ts
+
+
+	../../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file3.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+event:
+    {"seq":0,"type":"event","event":"projectLoadingFinish","body":{"projectName":"/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json"}}
+event:
+    {"seq":0,"type":"event","event":"telemetry","body":{"telemetryEventName":"projectInfo","payload":{"projectId":"79b1a0103ed8006f174a1f979cf698219d4ec4ae3a48594da1085f7a1749553c","fileStats":{"js":0,"jsSize":0,"jsx":0,"jsxSize":0,"ts":2,"tsSize":39,"tsx":0,"tsxSize":0,"dts":1,"dtsSize":334,"deferred":0,"deferredSize":0},"compilerOptions":{"typeRoots":[]},"typeAcquisition":{"enable":false,"include":false,"exclude":false},"extends":false,"files":false,"include":false,"exclude":false,"compileOnSave":false,"configFileName":"tsconfig.json","projectType":"configured","languageServiceEnabled":true,"version":"FakeVersion"}}}
+event:
+    {"seq":0,"type":"event","event":"configFileDiag","body":{"triggerFile":"/user/username/rootfolder/otherfolder/a/b/project/file1.ts","configFile":"/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json","diagnostics":[]}}
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+response:{"responseRequired":false}
+FileWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/project/file3.ts 1:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/project/file3.ts 1:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/project/file3.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+got projects updated in background, updating diagnostics for /user/username/rootfolder/otherfolder/a/b/project/file1.ts
+event:
+    {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/rootfolder/otherfolder/a/b/project/file1.ts"]}}
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: *ensureProjectForOpenFiles*
+Starting updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/a/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/rootfolder/otherfolder/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json Version: 3 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts
+	/user/username/rootfolder/otherfolder/a/b/project/file1.ts
+	/user/username/rootfolder/otherfolder/a/b/project/file3.ts
+
+
+	../../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../node_modules/file2.d.ts
+	  Imported via "file2" from file 'file1.ts'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file3.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+event:
+    {"seq":0,"type":"event","event":"syntaxDiag","body":{"file":"/user/username/rootfolder/otherfolder/a/b/project/file1.ts","diagnostics":[]}}
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/rootfolder/otherfolder/a/b/project/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/rootfolder/otherfolder/a/b/project/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json
+got projects updated in background, updating diagnostics for /user/username/rootfolder/otherfolder/a/b/project/file1.ts
+event:
+    {"seq":0,"type":"event","event":"projectsUpdatedInBackground","body":{"openFiles":["/user/username/rootfolder/otherfolder/a/b/project/file1.ts"]}}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projects/files-with-mixed-content-are-handled-correctly.js b/tests/baselines/reference/tsserver/projects/files-with-mixed-content-are-handled-correctly.js
new file mode 100644
index 0000000000000..7f9a48f41ec2f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projects/files-with-mixed-content-are-handled-correctly.js
@@ -0,0 +1,34 @@
+Provided types map file "/typesMap.json" doesn't exist
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: projectFileName
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: projectFileName WatchType: Missing file
+Finishing updateGraphWorker: Project: projectFileName Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project 'projectFileName' (External)
+	Files (1)
+	/a/b/f1.html
+
+
+	a/b/f1.html
+	  Root file specified for compilation
+
+-----------------------------------------------
+Text of/a/b/f1.html: 
+Starting updateGraphWorker: Project: projectFileName
+Finishing updateGraphWorker: Project: projectFileName Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Project 'projectFileName' (External)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/f1.html ProjectRootPath: undefined
+		Projects: projectFileName
+Starting updateGraphWorker: Project: projectFileName
+Finishing updateGraphWorker: Project: projectFileName Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+QuickInfo : var
+Project 'projectFileName' (External)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+Text of/a/b/f1.html: 
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/sample-project.js b/tests/baselines/reference/tsserver/projectsWithReferences/sample-project.js
new file mode 100644
index 0000000000000..e44bf5b68163e
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/sample-project.js
@@ -0,0 +1,201 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/sample1/tests
+For info: /user/username/projects/sample1/tests/index.ts :: Config file name: /user/username/projects/sample1/tests/tsconfig.json
+Creating configuration project /user/username/projects/sample1/tests/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/sample1/tests/tsconfig.json 2000 undefined Project: /user/username/projects/sample1/tests/tsconfig.json WatchType: Config file
+Config: /user/username/projects/sample1/tests/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/sample1/tests/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declaration": true,
+  "forceConsistentCasingInFileNames": true,
+  "skipDefaultLibCheck": true,
+  "configFilePath": "/user/username/projects/sample1/tests/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/sample1/core",
+   "originalPath": "../core"
+  },
+  {
+   "path": "/user/username/projects/sample1/logic",
+   "originalPath": "../logic"
+  }
+ ]
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/sample1/tests/tsconfig.json
+Config: /user/username/projects/sample1/core/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/sample1/core/anotherModule.ts",
+  "/user/username/projects/sample1/core/index.ts",
+  "/user/username/projects/sample1/core/some_decl.d.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declaration": true,
+  "declarationMap": true,
+  "skipDefaultLibCheck": true,
+  "configFilePath": "/user/username/projects/sample1/core/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/sample1/core/tsconfig.json 2000 undefined Project: /user/username/projects/sample1/tests/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/sample1/core 1 undefined Config: /user/username/projects/sample1/core/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/sample1/core 1 undefined Config: /user/username/projects/sample1/core/tsconfig.json WatchType: Wild card directory
+Config: /user/username/projects/sample1/logic/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/sample1/logic/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declaration": true,
+  "sourceMap": true,
+  "forceConsistentCasingInFileNames": true,
+  "skipDefaultLibCheck": true,
+  "configFilePath": "/user/username/projects/sample1/logic/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/sample1/core",
+   "originalPath": "../core"
+  }
+ ]
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/sample1/logic/tsconfig.json 2000 undefined Project: /user/username/projects/sample1/tests/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/sample1/logic 1 undefined Config: /user/username/projects/sample1/logic/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/sample1/logic 1 undefined Config: /user/username/projects/sample1/logic/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Added:: WatchInfo: /user/username/projects/sample1/core/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/sample1/logic/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/sample1/core/anotherModule.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/sample1/tests/node_modules/@types 1 undefined Project: /user/username/projects/sample1/tests/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/sample1/tests/node_modules/@types 1 undefined Project: /user/username/projects/sample1/tests/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/sample1/node_modules/@types 1 undefined Project: /user/username/projects/sample1/tests/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/sample1/node_modules/@types 1 undefined Project: /user/username/projects/sample1/tests/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/sample1/tests/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/sample1/tests/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/sample1/core/index.ts
+	/user/username/projects/sample1/core/anotherModule.ts
+	/user/username/projects/sample1/logic/index.ts
+	/user/username/projects/sample1/tests/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../core/index.ts
+	  Imported via '../core/index' from file 'index.ts'
+	  Imported via '../core/index' from file '../logic/index.ts'
+	../core/anotherModule.ts
+	  Imported via '../core/anotherModule' from file '../logic/index.ts'
+	  Imported via '../core/anotherModule' from file 'index.ts'
+	../logic/index.ts
+	  Imported via '../logic/index' from file 'index.ts'
+	index.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Search path: /user/username/projects/sample1/tests
+For info: /user/username/projects/sample1/tests/tsconfig.json :: No config files found.
+Project '/user/username/projects/sample1/tests/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/sample1/tests/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/sample1/tests/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/sample1/logic/index.ts 1:: WatchInfo: /user/username/projects/sample1/logic/index.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/sample1/tests/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/sample1/logic/index.ts 1:: WatchInfo: /user/username/projects/sample1/logic/index.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/sample1/tests/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/sample1/tests/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/sample1/tests/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/sample1/tests/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/sample1/tests/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/sample1/tests/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/sample1/tests/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/sample1/tests/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/sample1/tests/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/sample1/logic/index.ts 1:: WatchInfo: /user/username/projects/sample1/logic/index.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/sample1/tests/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/sample1/logic/index.ts 1:: WatchInfo: /user/username/projects/sample1/logic/index.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/sample1/tests/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/sample1/tests/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/sample1/tests/tsconfig.json Version: 3 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/sample1/tests/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/sample1/tests/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/sample1/tests/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/sample1/tests/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/sample1/tests/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/sample1/tests/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/sample1/logic/tsconfig.json 1:: WatchInfo: /user/username/projects/sample1/logic/tsconfig.json 2000 undefined Project: /user/username/projects/sample1/tests/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/sample1/tests/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/sample1/logic/tsconfig.json 1:: WatchInfo: /user/username/projects/sample1/logic/tsconfig.json 2000 undefined Project: /user/username/projects/sample1/tests/tsconfig.json WatchType: Config file
+Running: /user/username/projects/sample1/tests/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/sample1/tests/tsconfig.json
+Config: /user/username/projects/sample1/logic/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/sample1/logic/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "declaration": true,
+  "declarationDir": "/user/username/projects/sample1/logic/decls",
+  "configFilePath": "/user/username/projects/sample1/logic/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/sample1/core",
+   "originalPath": "../core"
+  }
+ ]
+}
+Finishing updateGraphWorker: Project: /user/username/projects/sample1/tests/tsconfig.json Version: 4 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/sample1/tests/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/sample1/tests/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/sample1/tests/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/sample1/tests/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/sample1/tests/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/sample1/tests/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-referenced-config-file.js
new file mode 100644
index 0000000000000..ab1b888149128
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-referenced-config-file.js
@@ -0,0 +1,245 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/c
+For info: /user/username/projects/myproject/c/index.ts :: Config file name: /user/username/projects/myproject/c/tsconfig.json
+Creating configuration project /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../refs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs/a.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 2:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 2:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ }
+}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../refs/a.d.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	  Imported via "@ref/a" from file 'index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	index.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-transitively-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-transitively-referenced-config-file.js
new file mode 100644
index 0000000000000..709c9a249aa2a
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-deleting-transitively-referenced-config-file.js
@@ -0,0 +1,179 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/c
+For info: /user/username/projects/myproject/c/index.ts :: Config file name: /user/username/projects/myproject/c/tsconfig.json
+Creating configuration project /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../refs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs/a.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json 2:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json 2:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-in-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-in-referenced-config-file.js
new file mode 100644
index 0000000000000..b290688efab06
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-in-referenced-config-file.js
@@ -0,0 +1,251 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/c
+For info: /user/username/projects/myproject/c/index.ts :: Config file name: /user/username/projects/myproject/c/tsconfig.json
+Creating configuration project /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../refs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs/a.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/nrefs :: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/nrefs :: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../nrefs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/nrefs/a.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/nrefs/a.d.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../nrefs/a.d.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-on-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-on-config-file.js
new file mode 100644
index 0000000000000..61a799bcd6ad5
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-edit-on-config-file.js
@@ -0,0 +1,293 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/c
+For info: /user/username/projects/myproject/c/index.ts :: Config file name: /user/username/projects/myproject/c/tsconfig.json
+Creating configuration project /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../refs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs/a.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/nrefs :: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/nrefs :: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Triggered with /user/username/projects/myproject/c/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/c/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Running: /user/username/projects/myproject/c/tsconfig.json
+Reloading configured project /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../nrefs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/nrefs/a.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/nrefs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../nrefs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/c/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/c/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Running: /user/username/projects/myproject/c/tsconfig.json
+Reloading configured project /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../refs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-non-local-edit.js b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-non-local-edit.js
new file mode 100644
index 0000000000000..72e063ef42fda
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/transitive-references-with-non-local-edit.js
@@ -0,0 +1,131 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/c
+For info: /user/username/projects/myproject/c/index.ts :: Config file name: /user/username/projects/myproject/c/tsconfig.json
+Creating configuration project /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../refs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs/a.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Part of 'files' list in tsconfig.json
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/b/index.ts 1:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/index.ts 1:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-referenced-config-file.js
new file mode 100644
index 0000000000000..835129e92d23c
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-referenced-config-file.js
@@ -0,0 +1,262 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/c
+For info: /user/username/projects/myproject/c/index.ts :: Config file name: /user/username/projects/myproject/c/tsconfig.json
+Creating configuration project /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../refs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c 1 undefined Config: /user/username/projects/myproject/c/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c 1 undefined Config: /user/username/projects/myproject/c/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs/a.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 2:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 2:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Project: /user/username/projects/myproject/b/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/b/tsconfig.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../refs/a.d.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	  Imported via "@ref/a" from file 'index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json :: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-transitively-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-transitively-referenced-config-file.js
new file mode 100644
index 0000000000000..d8d18bce4c550
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-deleting-transitively-referenced-config-file.js
@@ -0,0 +1,192 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/c
+For info: /user/username/projects/myproject/c/index.ts :: Config file name: /user/username/projects/myproject/c/tsconfig.json
+Creating configuration project /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../refs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c 1 undefined Config: /user/username/projects/myproject/c/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c 1 undefined Config: /user/username/projects/myproject/c/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs/a.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json 2:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json 2:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+Project: /user/username/projects/myproject/a/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/a/tsconfig.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json 0:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/c/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/a/tsconfig.json :: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-in-referenced-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-in-referenced-config-file.js
new file mode 100644
index 0000000000000..7c5985ce11521
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-in-referenced-config-file.js
@@ -0,0 +1,257 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/c
+For info: /user/username/projects/myproject/c/index.ts :: Config file name: /user/username/projects/myproject/c/tsconfig.json
+Creating configuration project /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../refs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c 1 undefined Config: /user/username/projects/myproject/c/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c 1 undefined Config: /user/username/projects/myproject/c/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs/a.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/nrefs :: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/nrefs :: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../nrefs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/nrefs/a.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/nrefs/a.d.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../nrefs/a.d.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-on-config-file.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-on-config-file.js
new file mode 100644
index 0000000000000..836c591957547
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-edit-on-config-file.js
@@ -0,0 +1,299 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/c
+For info: /user/username/projects/myproject/c/index.ts :: Config file name: /user/username/projects/myproject/c/tsconfig.json
+Creating configuration project /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../refs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c 1 undefined Config: /user/username/projects/myproject/c/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c 1 undefined Config: /user/username/projects/myproject/c/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs/a.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/nrefs :: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/nrefs :: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Triggered with /user/username/projects/myproject/c/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/c/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Running: /user/username/projects/myproject/c/tsconfig.json
+Reloading configured project /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../nrefs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/nrefs/a.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/nrefs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../nrefs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/c/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/c/tsconfig.json 1:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Running: /user/username/projects/myproject/c/tsconfig.json
+Reloading configured project /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../refs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/nrefs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-non-local-edit.js b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-non-local-edit.js
new file mode 100644
index 0000000000000..d8a0eac577f33
--- /dev/null
+++ b/tests/baselines/reference/tsserver/projectsWithReferences/trasitive-references-without-files-with-non-local-edit.js
@@ -0,0 +1,137 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/c
+For info: /user/username/projects/myproject/c/index.ts :: Config file name: /user/username/projects/myproject/c/tsconfig.json
+Creating configuration project /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/c/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/c/index.ts"
+ ],
+ "options": {
+  "baseUrl": "/user/username/projects/myproject/c",
+  "paths": {
+   "@ref/*": [
+    "../refs/*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/c",
+  "configFilePath": "/user/username/projects/myproject/c/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/b",
+   "originalPath": "../b"
+  }
+ ]
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c 1 undefined Config: /user/username/projects/myproject/c/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c 1 undefined Config: /user/username/projects/myproject/c/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Config: /user/username/projects/myproject/b/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/b/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "baseUrl": "/user/username/projects/myproject/b",
+  "paths": {
+   "@ref/*": [
+    "../*"
+   ]
+  },
+  "pathsBasePath": "/user/username/projects/myproject/b",
+  "configFilePath": "/user/username/projects/myproject/b/tsconfig.json"
+ },
+ "projectReferences": [
+  {
+   "path": "/user/username/projects/myproject/a",
+   "originalPath": "../a"
+  }
+ ]
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Config: /user/username/projects/myproject/b/tsconfig.json WatchType: Wild card directory
+Config: /user/username/projects/myproject/a/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/a/index.ts"
+ ],
+ "options": {
+  "composite": true,
+  "configFilePath": "/user/username/projects/myproject/a/tsconfig.json"
+ }
+}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Config: /user/username/projects/myproject/a/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a/index.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs/a.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/refs 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/a 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/c/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/c/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/a/index.ts
+	/user/username/projects/myproject/b/index.ts
+	/user/username/projects/myproject/refs/a.d.ts
+	/user/username/projects/myproject/c/index.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../a/index.ts
+	  Imported via '@ref/a' from file '../b/index.ts'
+	../b/index.ts
+	  Imported via '../b' from file 'index.ts'
+	../refs/a.d.ts
+	  Imported via "@ref/a" from file 'index.ts'
+	index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/b/index.ts 1:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/c/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/b/index.ts 1:: WatchInfo: /user/username/projects/myproject/b/index.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/c/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/c/tsconfig.json Version: 2 structureChanged: false structureIsReused:: Completely Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/c/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/c/index.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/c/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/resolutionCache/avoid-unnecessary-lookup-invalidation-on-save.js b/tests/baselines/reference/tsserver/resolutionCache/avoid-unnecessary-lookup-invalidation-on-save.js
new file mode 100644
index 0000000000000..66902015cbc29
--- /dev/null
+++ b/tests/baselines/reference/tsserver/resolutionCache/avoid-unnecessary-lookup-invalidation-on-save.js
@@ -0,0 +1,87 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/src
+For info: /user/username/projects/myproject/src/file1.ts :: Config file name: /user/username/projects/myproject/tsconfig.json
+Creating configuration project /user/username/projects/myproject/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/src/file1.ts"
+ ],
+ "options": {
+  "traceResolution": true,
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+======== Resolving module 'module1' from '/user/username/projects/myproject/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module1' from 'node_modules' folder, target file type 'TypeScript'.
+File '/user/username/projects/myproject/src/node_modules/module1/package.json' does not exist.
+File '/user/username/projects/myproject/src/node_modules/module1.ts' does not exist.
+File '/user/username/projects/myproject/src/node_modules/module1.tsx' does not exist.
+File '/user/username/projects/myproject/src/node_modules/module1.d.ts' does not exist.
+File '/user/username/projects/myproject/src/node_modules/module1/index.ts' exist - use it as a name resolution result.
+Resolving real path for '/user/username/projects/myproject/src/node_modules/module1/index.ts', result '/user/username/projects/myproject/src/node_modules/module1/index.ts'.
+======== Module name 'module1' was successfully resolved to '/user/username/projects/myproject/src/node_modules/module1/index.ts'. ========
+======== Resolving module 'module2' from '/user/username/projects/myproject/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module2' from 'node_modules' folder, target file type 'TypeScript'.
+File '/user/username/projects/myproject/src/node_modules/module2.ts' does not exist.
+File '/user/username/projects/myproject/src/node_modules/module2.tsx' does not exist.
+File '/user/username/projects/myproject/src/node_modules/module2.d.ts' does not exist.
+Directory '/user/username/projects/myproject/src/node_modules/@types' does not exist, skipping all lookups in it.
+File '/user/username/projects/myproject/node_modules/module2/package.json' does not exist.
+File '/user/username/projects/myproject/node_modules/module2.ts' does not exist.
+File '/user/username/projects/myproject/node_modules/module2.tsx' does not exist.
+File '/user/username/projects/myproject/node_modules/module2.d.ts' does not exist.
+File '/user/username/projects/myproject/node_modules/module2/index.ts' exist - use it as a name resolution result.
+Resolving real path for '/user/username/projects/myproject/node_modules/module2/index.ts', result '/user/username/projects/myproject/node_modules/module2/index.ts'.
+======== Module name 'module2' was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'. ========
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/src/node_modules/module1/index.ts
+	/user/username/projects/myproject/node_modules/module2/index.ts
+	/user/username/projects/myproject/src/file1.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	src/node_modules/module1/index.ts
+	  Imported via "module1" from file 'src/file1.ts'
+	node_modules/module2/index.ts
+	  Imported via "module2" from file 'src/file1.ts'
+	src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/file1.ts :: WatchInfo: /user/username/projects/myproject/src 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/file1.ts :: WatchInfo: /user/username/projects/myproject/src 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/file1.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/file1.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/file1.ts :: WatchInfo: /user/username/projects/myproject/src 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/file1.ts :: WatchInfo: /user/username/projects/myproject/src 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/file1.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/file1.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/resolutionCache/can-load-typings-that-are-proper-modules.js b/tests/baselines/reference/tsserver/resolutionCache/can-load-typings-that-are-proper-modules.js
new file mode 100644
index 0000000000000..1e3eedf16337f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/resolutionCache/can-load-typings-that-are-proper-modules.js
@@ -0,0 +1,46 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/b
+For info: /a/b/app.js :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+======== Resolving module 'lib' from '/a/b/app.js'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'lib' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/a/b/node_modules' does not exist, skipping all lookups in it.
+Directory '/a/node_modules' does not exist, skipping all lookups in it.
+Directory '/node_modules' does not exist, skipping all lookups in it.
+Loading module 'lib' from 'node_modules' folder, target file type 'JavaScript'.
+Directory '/a/b/node_modules' does not exist, skipping all lookups in it.
+Directory '/a/node_modules' does not exist, skipping all lookups in it.
+Directory '/node_modules' does not exist, skipping all lookups in it.
+======== Module name 'lib' was not resolved. ========
+Auto discovery for typings is enabled in project '/dev/null/inferredProject1*'. Running extra resolution pass for module 'lib' using cache location '/a/cache'.
+File '/a/cache/node_modules/lib.d.ts' does not exist.
+File '/a/cache/node_modules/@types/lib/package.json' does not exist.
+File '/a/cache/node_modules/@types/lib.d.ts' does not exist.
+File '/a/cache/node_modules/@types/lib/index.d.ts' exist - use it as a name resolution result.
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/cache/node_modules/@types/lib/index.d.ts
+	/a/b/app.js
+
+
+	../cache/node_modules/@types/lib/index.d.ts
+	  Imported via "lib" from file 'app.js'
+	app.js
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/app.js ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-different-folders.js b/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-different-folders.js
new file mode 100644
index 0000000000000..c2cf54b06170b
--- /dev/null
+++ b/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-different-folders.js
@@ -0,0 +1,179 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/product/src
+For info: /user/username/projects/myproject/product/src/file1.ts :: Config file name: /user/username/projects/myproject/tsconfig.json
+Creating configuration project /user/username/projects/myproject/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/product/src/file1.ts",
+  "/user/username/projects/myproject/product/src/feature/file2.ts",
+  "/user/username/projects/myproject/product/test/file4.ts",
+  "/user/username/projects/myproject/product/test/src/file3.ts"
+ ],
+ "options": {
+  "traceResolution": true,
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/src/feature/file2.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/test/file4.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/test/src/file3.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+======== Resolving module 'module1' from '/user/username/projects/myproject/product/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module1' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/src/node_modules' does not exist, skipping all lookups in it.
+File '/user/username/projects/myproject/product/node_modules/module1/package.json' does not exist.
+File '/user/username/projects/myproject/product/node_modules/module1.ts' does not exist.
+File '/user/username/projects/myproject/product/node_modules/module1.tsx' does not exist.
+File '/user/username/projects/myproject/product/node_modules/module1.d.ts' does not exist.
+File '/user/username/projects/myproject/product/node_modules/module1/index.ts' exist - use it as a name resolution result.
+Resolving real path for '/user/username/projects/myproject/product/node_modules/module1/index.ts', result '/user/username/projects/myproject/product/node_modules/module1/index.ts'.
+======== Module name 'module1' was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'. ========
+======== Resolving module 'module2' from '/user/username/projects/myproject/product/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module2' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/src/node_modules' does not exist, skipping all lookups in it.
+File '/user/username/projects/myproject/product/node_modules/module2.ts' does not exist.
+File '/user/username/projects/myproject/product/node_modules/module2.tsx' does not exist.
+File '/user/username/projects/myproject/product/node_modules/module2.d.ts' does not exist.
+Directory '/user/username/projects/myproject/product/node_modules/@types' does not exist, skipping all lookups in it.
+File '/user/username/projects/myproject/node_modules/module2/package.json' does not exist.
+File '/user/username/projects/myproject/node_modules/module2.ts' does not exist.
+File '/user/username/projects/myproject/node_modules/module2.tsx' does not exist.
+File '/user/username/projects/myproject/node_modules/module2.d.ts' does not exist.
+File '/user/username/projects/myproject/node_modules/module2/index.ts' exist - use it as a name resolution result.
+Resolving real path for '/user/username/projects/myproject/node_modules/module2/index.ts', result '/user/username/projects/myproject/node_modules/module2/index.ts'.
+======== Module name 'module2' was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'. ========
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+======== Resolving module 'module1' from '/user/username/projects/myproject/product/src/feature/file2.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module1' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/src/feature/node_modules' does not exist, skipping all lookups in it.
+Resolution for module 'module1' was found in cache from location '/user/username/projects/myproject/product/src'.
+======== Module name 'module1' was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'. ========
+======== Resolving module 'module2' from '/user/username/projects/myproject/product/src/feature/file2.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module2' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/src/feature/node_modules' does not exist, skipping all lookups in it.
+Resolution for module 'module2' was found in cache from location '/user/username/projects/myproject/product/src'.
+======== Module name 'module2' was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'. ========
+======== Resolving module 'module1' from '/user/username/projects/myproject/product/test/file4.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module1' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/test/node_modules' does not exist, skipping all lookups in it.
+Resolution for module 'module1' was found in cache from location '/user/username/projects/myproject/product'.
+======== Module name 'module1' was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'. ========
+======== Resolving module 'module2' from '/user/username/projects/myproject/product/test/file4.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module2' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/test/node_modules' does not exist, skipping all lookups in it.
+Resolution for module 'module2' was found in cache from location '/user/username/projects/myproject/product'.
+======== Module name 'module2' was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'. ========
+======== Resolving module 'module1' from '/user/username/projects/myproject/product/test/src/file3.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module1' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/test/src/node_modules' does not exist, skipping all lookups in it.
+Resolution for module 'module1' was found in cache from location '/user/username/projects/myproject/product/test'.
+======== Module name 'module1' was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'. ========
+======== Resolving module 'module2' from '/user/username/projects/myproject/product/test/src/file3.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module2' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/test/src/node_modules' does not exist, skipping all lookups in it.
+Resolution for module 'module2' was found in cache from location '/user/username/projects/myproject/product/test'.
+======== Module name 'module2' was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'. ========
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (7)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/product/node_modules/module1/index.ts
+	/user/username/projects/myproject/node_modules/module2/index.ts
+	/user/username/projects/myproject/product/src/file1.ts
+	/user/username/projects/myproject/product/src/feature/file2.ts
+	/user/username/projects/myproject/product/test/file4.ts
+	/user/username/projects/myproject/product/test/src/file3.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	product/node_modules/module1/index.ts
+	  Imported via "module1" from file 'product/src/file1.ts'
+	  Imported via "module1" from file 'product/src/feature/file2.ts'
+	  Imported via "module1" from file 'product/test/file4.ts'
+	  Imported via "module1" from file 'product/test/src/file3.ts'
+	node_modules/module2/index.ts
+	  Imported via "module2" from file 'product/src/file1.ts'
+	  Imported via "module2" from file 'product/src/feature/file2.ts'
+	  Imported via "module2" from file 'product/test/file4.ts'
+	  Imported via "module2" from file 'product/test/src/file3.ts'
+	product/src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	product/src/feature/file2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	product/test/file4.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	product/test/src/file3.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (7)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/product/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/product/src/feature/file2.ts 1:: WatchInfo: /user/username/projects/myproject/product/src/feature/file2.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/product/src/feature/file2.ts 1:: WatchInfo: /user/username/projects/myproject/product/src/feature/file2.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Triggered with /user/username/projects/myproject/product/test/src/file3.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/src/file3.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/product/test/src/file3.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/src/file3.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Triggered with /user/username/projects/myproject/product/test/file4.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/file4.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/product/test/file4.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/file4.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+Reusing resolution of module 'module1' from '/user/username/projects/myproject/product/src/file1.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'.
+Reusing resolution of module 'module2' from '/user/username/projects/myproject/product/src/file1.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'.
+Reusing resolution of module 'module1' from '/user/username/projects/myproject/product/src/feature/file2.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'.
+Reusing resolution of module 'module2' from '/user/username/projects/myproject/product/src/feature/file2.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'.
+Reusing resolution of module 'module1' from '/user/username/projects/myproject/product/test/file4.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'.
+Reusing resolution of module 'module2' from '/user/username/projects/myproject/product/test/file4.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'.
+Reusing resolution of module 'module1' from '/user/username/projects/myproject/product/test/src/file3.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'.
+Reusing resolution of module 'module2' from '/user/username/projects/myproject/product/test/src/file3.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'.
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (7)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/product/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (7)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/product/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-same-folder.js b/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-same-folder.js
new file mode 100644
index 0000000000000..9b311f8e25391
--- /dev/null
+++ b/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-files-in-same-folder.js
@@ -0,0 +1,117 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/src
+For info: /user/username/projects/myproject/src/file1.ts :: Config file name: /user/username/projects/myproject/tsconfig.json
+Creating configuration project /user/username/projects/myproject/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/src/file1.ts",
+  "/user/username/projects/myproject/src/file2.ts"
+ ],
+ "options": {
+  "traceResolution": true,
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/file2.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+======== Resolving module 'module1' from '/user/username/projects/myproject/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module1' from 'node_modules' folder, target file type 'TypeScript'.
+File '/user/username/projects/myproject/src/node_modules/module1/package.json' does not exist.
+File '/user/username/projects/myproject/src/node_modules/module1.ts' does not exist.
+File '/user/username/projects/myproject/src/node_modules/module1.tsx' does not exist.
+File '/user/username/projects/myproject/src/node_modules/module1.d.ts' does not exist.
+File '/user/username/projects/myproject/src/node_modules/module1/index.ts' exist - use it as a name resolution result.
+Resolving real path for '/user/username/projects/myproject/src/node_modules/module1/index.ts', result '/user/username/projects/myproject/src/node_modules/module1/index.ts'.
+======== Module name 'module1' was successfully resolved to '/user/username/projects/myproject/src/node_modules/module1/index.ts'. ========
+======== Resolving module 'module2' from '/user/username/projects/myproject/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module2' from 'node_modules' folder, target file type 'TypeScript'.
+File '/user/username/projects/myproject/src/node_modules/module2.ts' does not exist.
+File '/user/username/projects/myproject/src/node_modules/module2.tsx' does not exist.
+File '/user/username/projects/myproject/src/node_modules/module2.d.ts' does not exist.
+Directory '/user/username/projects/myproject/src/node_modules/@types' does not exist, skipping all lookups in it.
+File '/user/username/projects/myproject/node_modules/module2/package.json' does not exist.
+File '/user/username/projects/myproject/node_modules/module2.ts' does not exist.
+File '/user/username/projects/myproject/node_modules/module2.tsx' does not exist.
+File '/user/username/projects/myproject/node_modules/module2.d.ts' does not exist.
+File '/user/username/projects/myproject/node_modules/module2/index.ts' exist - use it as a name resolution result.
+Resolving real path for '/user/username/projects/myproject/node_modules/module2/index.ts', result '/user/username/projects/myproject/node_modules/module2/index.ts'.
+======== Module name 'module2' was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'. ========
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Reusing resolution of module 'module1' from '/user/username/projects/myproject/src/file2.ts' found in cache from location '/user/username/projects/myproject/src', it was successfully resolved to '/user/username/projects/myproject/src/node_modules/module1/index.ts'.
+Reusing resolution of module 'module2' from '/user/username/projects/myproject/src/file2.ts' found in cache from location '/user/username/projects/myproject/src', it was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'.
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/src/node_modules/module1/index.ts
+	/user/username/projects/myproject/node_modules/module2/index.ts
+	/user/username/projects/myproject/src/file1.ts
+	/user/username/projects/myproject/src/file2.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	src/node_modules/module1/index.ts
+	  Imported via "module1" from file 'src/file1.ts'
+	  Imported via "module1" from file 'src/file2.ts'
+	node_modules/module2/index.ts
+	  Imported via "module2" from file 'src/file1.ts'
+	  Imported via "module2" from file 'src/file2.ts'
+	src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	src/file2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/src/file2.ts 1:: WatchInfo: /user/username/projects/myproject/src/file2.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/src/file2.ts 1:: WatchInfo: /user/username/projects/myproject/src/file2.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+Reusing resolution of module 'module1' from '/user/username/projects/myproject/src/file1.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/src/node_modules/module1/index.ts'.
+Reusing resolution of module 'module2' from '/user/username/projects/myproject/src/file1.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'.
+Reusing resolution of module 'module1' from '/user/username/projects/myproject/src/file2.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/src/node_modules/module1/index.ts'.
+Reusing resolution of module 'module2' from '/user/username/projects/myproject/src/file2.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'.
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-inferred-project.js b/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-inferred-project.js
new file mode 100644
index 0000000000000..b9fc8310ab498
--- /dev/null
+++ b/tests/baselines/reference/tsserver/resolutionCache/non-relative-module-name-from-inferred-project.js
@@ -0,0 +1,199 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/product/src
+For info: /user/username/projects/myproject/product/src/file1.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/src/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/src/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+======== Resolving module './feature/file2' from '/user/username/projects/myproject/product/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/product/src/feature/file2', target file type 'TypeScript'.
+File '/user/username/projects/myproject/product/src/feature/file2.ts' exist - use it as a name resolution result.
+======== Module name './feature/file2' was successfully resolved to '/user/username/projects/myproject/product/src/feature/file2.ts'. ========
+======== Resolving module '../test/file4' from '/user/username/projects/myproject/product/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/product/test/file4', target file type 'TypeScript'.
+File '/user/username/projects/myproject/product/test/file4.ts' exist - use it as a name resolution result.
+======== Module name '../test/file4' was successfully resolved to '/user/username/projects/myproject/product/test/file4.ts'. ========
+======== Resolving module '../test/src/file3' from '/user/username/projects/myproject/product/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/product/test/src/file3', target file type 'TypeScript'.
+File '/user/username/projects/myproject/product/test/src/file3.ts' exist - use it as a name resolution result.
+======== Module name '../test/src/file3' was successfully resolved to '/user/username/projects/myproject/product/test/src/file3.ts'. ========
+======== Resolving module 'module1' from '/user/username/projects/myproject/product/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module1' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/src/node_modules' does not exist, skipping all lookups in it.
+File '/user/username/projects/myproject/product/node_modules/module1/package.json' does not exist.
+File '/user/username/projects/myproject/product/node_modules/module1.ts' does not exist.
+File '/user/username/projects/myproject/product/node_modules/module1.tsx' does not exist.
+File '/user/username/projects/myproject/product/node_modules/module1.d.ts' does not exist.
+File '/user/username/projects/myproject/product/node_modules/module1/index.ts' exist - use it as a name resolution result.
+Resolving real path for '/user/username/projects/myproject/product/node_modules/module1/index.ts', result '/user/username/projects/myproject/product/node_modules/module1/index.ts'.
+======== Module name 'module1' was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'. ========
+======== Resolving module 'module2' from '/user/username/projects/myproject/product/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module2' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/src/node_modules' does not exist, skipping all lookups in it.
+File '/user/username/projects/myproject/product/node_modules/module2.ts' does not exist.
+File '/user/username/projects/myproject/product/node_modules/module2.tsx' does not exist.
+File '/user/username/projects/myproject/product/node_modules/module2.d.ts' does not exist.
+Directory '/user/username/projects/myproject/product/node_modules/@types' does not exist, skipping all lookups in it.
+File '/user/username/projects/myproject/node_modules/module2/package.json' does not exist.
+File '/user/username/projects/myproject/node_modules/module2.ts' does not exist.
+File '/user/username/projects/myproject/node_modules/module2.tsx' does not exist.
+File '/user/username/projects/myproject/node_modules/module2.d.ts' does not exist.
+File '/user/username/projects/myproject/node_modules/module2/index.ts' exist - use it as a name resolution result.
+Resolving real path for '/user/username/projects/myproject/node_modules/module2/index.ts', result '/user/username/projects/myproject/node_modules/module2/index.ts'.
+======== Module name 'module2' was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'. ========
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/src/feature/file2.ts 500 undefined WatchType: Closed Script info
+======== Resolving module 'module1' from '/user/username/projects/myproject/product/src/feature/file2.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module1' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/src/feature/node_modules' does not exist, skipping all lookups in it.
+Resolution for module 'module1' was found in cache from location '/user/username/projects/myproject/product/src'.
+======== Module name 'module1' was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'. ========
+======== Resolving module 'module2' from '/user/username/projects/myproject/product/src/feature/file2.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module2' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/src/feature/node_modules' does not exist, skipping all lookups in it.
+Resolution for module 'module2' was found in cache from location '/user/username/projects/myproject/product/src'.
+======== Module name 'module2' was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'. ========
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/test/file4.ts 500 undefined WatchType: Closed Script info
+======== Resolving module 'module1' from '/user/username/projects/myproject/product/test/file4.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module1' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/test/node_modules' does not exist, skipping all lookups in it.
+Resolution for module 'module1' was found in cache from location '/user/username/projects/myproject/product'.
+======== Module name 'module1' was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'. ========
+======== Resolving module 'module2' from '/user/username/projects/myproject/product/test/file4.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module2' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/test/node_modules' does not exist, skipping all lookups in it.
+Resolution for module 'module2' was found in cache from location '/user/username/projects/myproject/product'.
+======== Module name 'module2' was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'. ========
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/test/src/file3.ts 500 undefined WatchType: Closed Script info
+======== Resolving module 'module1' from '/user/username/projects/myproject/product/test/src/file3.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module1' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/test/src/node_modules' does not exist, skipping all lookups in it.
+Resolution for module 'module1' was found in cache from location '/user/username/projects/myproject/product/test'.
+======== Module name 'module1' was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'. ========
+======== Resolving module 'module2' from '/user/username/projects/myproject/product/test/src/file3.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module 'module2' from 'node_modules' folder, target file type 'TypeScript'.
+Directory '/user/username/projects/myproject/product/test/src/node_modules' does not exist, skipping all lookups in it.
+Resolution for module 'module2' was found in cache from location '/user/username/projects/myproject/product/test'.
+======== Module name 'module2' was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'. ========
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/src/feature 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/src/feature 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/test/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/test/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/test/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/test/src/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/src/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (7)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/product/node_modules/module1/index.ts
+	/user/username/projects/myproject/node_modules/module2/index.ts
+	/user/username/projects/myproject/product/src/feature/file2.ts
+	/user/username/projects/myproject/product/test/file4.ts
+	/user/username/projects/myproject/product/test/src/file3.ts
+	/user/username/projects/myproject/product/src/file1.ts
+
+
+	../../../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	../node_modules/module1/index.ts
+	  Imported via "module1" from file 'feature/file2.ts'
+	  Imported via "module1" from file '../test/file4.ts'
+	  Imported via "module1" from file '../test/src/file3.ts'
+	  Imported via "module1" from file 'file1.ts'
+	../../node_modules/module2/index.ts
+	  Imported via "module2" from file 'feature/file2.ts'
+	  Imported via "module2" from file '../test/file4.ts'
+	  Imported via "module2" from file '../test/src/file3.ts'
+	  Imported via "module2" from file 'file1.ts'
+	feature/file2.ts
+	  Imported via "./feature/file2" from file 'file1.ts'
+	../test/file4.ts
+	  Imported via "../test/file4" from file 'file1.ts'
+	../test/src/file3.ts
+	  Imported via "../test/src/file3" from file 'file1.ts'
+	file1.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (7)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/product/src/file1.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+FileWatcher:: Triggered with /user/username/projects/myproject/product/src/feature/file2.ts 1:: WatchInfo: /user/username/projects/myproject/product/src/feature/file2.ts 500 undefined WatchType: Closed Script info
+Scheduled: /dev/null/inferredProject1*
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/product/src/feature/file2.ts 1:: WatchInfo: /user/username/projects/myproject/product/src/feature/file2.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Triggered with /user/username/projects/myproject/product/test/src/file3.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/src/file3.ts 500 undefined WatchType: Closed Script info
+Scheduled: /dev/null/inferredProject1*, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/product/test/src/file3.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/src/file3.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Triggered with /user/username/projects/myproject/product/test/file4.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/file4.ts 500 undefined WatchType: Closed Script info
+Scheduled: /dev/null/inferredProject1*, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/product/test/file4.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/file4.ts 500 undefined WatchType: Closed Script info
+Running: /dev/null/inferredProject1*
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Reusing resolution of module './feature/file2' from '/user/username/projects/myproject/product/src/file1.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/src/feature/file2.ts'.
+Reusing resolution of module '../test/file4' from '/user/username/projects/myproject/product/src/file1.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/test/file4.ts'.
+Reusing resolution of module '../test/src/file3' from '/user/username/projects/myproject/product/src/file1.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/test/src/file3.ts'.
+Reusing resolution of module 'module1' from '/user/username/projects/myproject/product/src/file1.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'.
+Reusing resolution of module 'module2' from '/user/username/projects/myproject/product/src/file1.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'.
+Reusing resolution of module 'module1' from '/user/username/projects/myproject/product/src/feature/file2.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'.
+Reusing resolution of module 'module2' from '/user/username/projects/myproject/product/src/feature/file2.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'.
+Reusing resolution of module 'module1' from '/user/username/projects/myproject/product/test/file4.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'.
+Reusing resolution of module 'module2' from '/user/username/projects/myproject/product/test/file4.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'.
+Reusing resolution of module 'module1' from '/user/username/projects/myproject/product/test/src/file3.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/node_modules/module1/index.ts'.
+Reusing resolution of module 'module2' from '/user/username/projects/myproject/product/test/src/file3.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/node_modules/module2/index.ts'.
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (7)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/product/src/file1.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+After ensureProjectForOpenFiles:
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (7)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/product/src/file1.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-different-folders.js b/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-different-folders.js
new file mode 100644
index 0000000000000..dc4b5e05d513f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-different-folders.js
@@ -0,0 +1,163 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/product/src
+For info: /user/username/projects/myproject/product/src/file1.ts :: Config file name: /user/username/projects/myproject/tsconfig.json
+Creating configuration project /user/username/projects/myproject/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/product/module2.ts",
+  "/user/username/projects/myproject/product/src/file1.ts",
+  "/user/username/projects/myproject/product/src/module1.ts",
+  "/user/username/projects/myproject/product/src/feature/file2.ts",
+  "/user/username/projects/myproject/product/test/file4.ts",
+  "/user/username/projects/myproject/product/test/src/file3.ts"
+ ],
+ "options": {
+  "traceResolution": true,
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/module2.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/src/module1.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/src/feature/file2.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/test/file4.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product/test/src/file3.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+======== Resolving module './module1' from '/user/username/projects/myproject/product/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/product/src/module1', target file type 'TypeScript'.
+File '/user/username/projects/myproject/product/src/module1.ts' exist - use it as a name resolution result.
+======== Module name './module1' was successfully resolved to '/user/username/projects/myproject/product/src/module1.ts'. ========
+======== Resolving module '../module2' from '/user/username/projects/myproject/product/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/product/module2', target file type 'TypeScript'.
+File '/user/username/projects/myproject/product/module2.ts' exist - use it as a name resolution result.
+======== Module name '../module2' was successfully resolved to '/user/username/projects/myproject/product/module2.ts'. ========
+======== Resolving module '../module1' from '/user/username/projects/myproject/product/src/feature/file2.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/product/src/module1', target file type 'TypeScript'.
+File '/user/username/projects/myproject/product/src/module1.ts' exist - use it as a name resolution result.
+======== Module name '../module1' was successfully resolved to '/user/username/projects/myproject/product/src/module1.ts'. ========
+======== Resolving module '../../module2' from '/user/username/projects/myproject/product/src/feature/file2.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/product/module2', target file type 'TypeScript'.
+File '/user/username/projects/myproject/product/module2.ts' exist - use it as a name resolution result.
+======== Module name '../../module2' was successfully resolved to '/user/username/projects/myproject/product/module2.ts'. ========
+======== Resolving module '../src/module1}' from '/user/username/projects/myproject/product/test/file4.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/product/src/module1}', target file type 'TypeScript'.
+File '/user/username/projects/myproject/product/src/module1}.ts' does not exist.
+File '/user/username/projects/myproject/product/src/module1}.tsx' does not exist.
+File '/user/username/projects/myproject/product/src/module1}.d.ts' does not exist.
+Directory '/user/username/projects/myproject/product/src/module1}' does not exist, skipping all lookups in it.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/product/src/module1}', target file type 'JavaScript'.
+File '/user/username/projects/myproject/product/src/module1}.js' does not exist.
+File '/user/username/projects/myproject/product/src/module1}.jsx' does not exist.
+Directory '/user/username/projects/myproject/product/src/module1}' does not exist, skipping all lookups in it.
+======== Module name '../src/module1}' was not resolved. ========
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/product 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+======== Resolving module '../module2' from '/user/username/projects/myproject/product/test/file4.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/product/module2', target file type 'TypeScript'.
+File '/user/username/projects/myproject/product/module2.ts' exist - use it as a name resolution result.
+======== Module name '../module2' was successfully resolved to '/user/username/projects/myproject/product/module2.ts'. ========
+======== Resolving module '../../src/module1' from '/user/username/projects/myproject/product/test/src/file3.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/product/src/module1', target file type 'TypeScript'.
+File '/user/username/projects/myproject/product/src/module1.ts' exist - use it as a name resolution result.
+======== Module name '../../src/module1' was successfully resolved to '/user/username/projects/myproject/product/src/module1.ts'. ========
+======== Resolving module '../../module2' from '/user/username/projects/myproject/product/test/src/file3.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/product/module2', target file type 'TypeScript'.
+File '/user/username/projects/myproject/product/module2.ts' exist - use it as a name resolution result.
+======== Module name '../../module2' was successfully resolved to '/user/username/projects/myproject/product/module2.ts'. ========
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (7)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/product/module2.ts
+	/user/username/projects/myproject/product/src/module1.ts
+	/user/username/projects/myproject/product/src/file1.ts
+	/user/username/projects/myproject/product/src/feature/file2.ts
+	/user/username/projects/myproject/product/test/file4.ts
+	/user/username/projects/myproject/product/test/src/file3.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	product/module2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	  Imported via "../module2" from file 'product/src/file1.ts'
+	  Imported via "../../module2" from file 'product/src/feature/file2.ts'
+	  Imported via "../module2" from file 'product/test/file4.ts'
+	  Imported via "../../module2" from file 'product/test/src/file3.ts'
+	product/src/module1.ts
+	  Imported via "./module1" from file 'product/src/file1.ts'
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	  Imported via "../module1" from file 'product/src/feature/file2.ts'
+	  Imported via "../../src/module1" from file 'product/test/src/file3.ts'
+	product/src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	product/src/feature/file2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	product/test/file4.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	product/test/src/file3.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (7)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/product/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/product/src/feature/file2.ts 1:: WatchInfo: /user/username/projects/myproject/product/src/feature/file2.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/product/src/feature/file2.ts 1:: WatchInfo: /user/username/projects/myproject/product/src/feature/file2.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Triggered with /user/username/projects/myproject/product/test/src/file3.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/src/file3.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/product/test/src/file3.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/src/file3.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Triggered with /user/username/projects/myproject/product/test/file4.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/file4.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/product/test/file4.ts 1:: WatchInfo: /user/username/projects/myproject/product/test/file4.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+Reusing resolution of module './module1' from '/user/username/projects/myproject/product/src/file1.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/src/module1.ts'.
+Reusing resolution of module '../module2' from '/user/username/projects/myproject/product/src/file1.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/module2.ts'.
+Reusing resolution of module '../module1' from '/user/username/projects/myproject/product/src/feature/file2.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/src/module1.ts'.
+Reusing resolution of module '../../module2' from '/user/username/projects/myproject/product/src/feature/file2.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/module2.ts'.
+Reusing resolution of module '../src/module1}' from '/user/username/projects/myproject/product/test/file4.ts' of old program, it was not resolved.
+Reusing resolution of module '../module2' from '/user/username/projects/myproject/product/test/file4.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/module2.ts'.
+Reusing resolution of module '../../src/module1' from '/user/username/projects/myproject/product/test/src/file3.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/src/module1.ts'.
+Reusing resolution of module '../../module2' from '/user/username/projects/myproject/product/test/src/file3.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/product/module2.ts'.
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (7)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/product/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (7)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/product/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-same-folder.js b/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-same-folder.js
new file mode 100644
index 0000000000000..efb9d06f768b7
--- /dev/null
+++ b/tests/baselines/reference/tsserver/resolutionCache/relative-module-name-from-files-in-same-folder.js
@@ -0,0 +1,101 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/src
+For info: /user/username/projects/myproject/src/file1.ts :: Config file name: /user/username/projects/myproject/tsconfig.json
+Creating configuration project /user/username/projects/myproject/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/module2.ts",
+  "/user/username/projects/myproject/src/file1.ts",
+  "/user/username/projects/myproject/src/file2.ts",
+  "/user/username/projects/myproject/src/module1.ts"
+ ],
+ "options": {
+  "traceResolution": true,
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/module2.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/file2.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/module1.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+======== Resolving module './module1' from '/user/username/projects/myproject/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/src/module1', target file type 'TypeScript'.
+File '/user/username/projects/myproject/src/module1.ts' exist - use it as a name resolution result.
+======== Module name './module1' was successfully resolved to '/user/username/projects/myproject/src/module1.ts'. ========
+======== Resolving module '../module2' from '/user/username/projects/myproject/src/file1.ts'. ========
+Module resolution kind is not specified, using 'NodeJs'.
+Loading module as file / folder, candidate module location '/user/username/projects/myproject/module2', target file type 'TypeScript'.
+File '/user/username/projects/myproject/module2.ts' exist - use it as a name resolution result.
+======== Module name '../module2' was successfully resolved to '/user/username/projects/myproject/module2.ts'. ========
+Reusing resolution of module './module1' from '/user/username/projects/myproject/src/file2.ts' found in cache from location '/user/username/projects/myproject/src', it was successfully resolved to '/user/username/projects/myproject/src/module1.ts'.
+Reusing resolution of module '../module2' from '/user/username/projects/myproject/src/file2.ts' found in cache from location '/user/username/projects/myproject/src', it was successfully resolved to '/user/username/projects/myproject/module2.ts'.
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/module2.ts
+	/user/username/projects/myproject/src/module1.ts
+	/user/username/projects/myproject/src/file1.ts
+	/user/username/projects/myproject/src/file2.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	module2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	  Imported via "../module2" from file 'src/file1.ts'
+	  Imported via "../module2" from file 'src/file2.ts'
+	src/module1.ts
+	  Imported via "./module1" from file 'src/file1.ts'
+	  Imported via "./module1" from file 'src/file2.ts'
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	src/file2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
+FileWatcher:: Triggered with /user/username/projects/myproject/src/file2.ts 1:: WatchInfo: /user/username/projects/myproject/src/file2.ts 500 undefined WatchType: Closed Script info
+Scheduled: /user/username/projects/myproject/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/src/file2.ts 1:: WatchInfo: /user/username/projects/myproject/src/file2.ts 500 undefined WatchType: Closed Script info
+Running: /user/username/projects/myproject/tsconfig.json
+Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+Reusing resolution of module './module1' from '/user/username/projects/myproject/src/file1.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/src/module1.ts'.
+Reusing resolution of module '../module2' from '/user/username/projects/myproject/src/file1.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/module2.ts'.
+Reusing resolution of module './module1' from '/user/username/projects/myproject/src/file2.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/src/module1.ts'.
+Reusing resolution of module '../module2' from '/user/username/projects/myproject/src/file2.ts' of old program, it was successfully resolved to '/user/username/projects/myproject/module2.ts'.
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 2 structureChanged: true structureIsReused:: SafeModules Elapsed:: *ms
+Different program with same set of files
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/file1.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js
new file mode 100644
index 0000000000000..afad00c945dae
--- /dev/null
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails.js
@@ -0,0 +1,73 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/src/somefolder
+For info: /user/username/projects/myproject/src/somefolder/srcfile.ts :: Config file name: /user/username/projects/myproject/src/tsconfig.json
+Creating configuration project /user/username/projects/myproject/src/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/src/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/src/somefolder/module1.ts",
+  "/user/username/projects/myproject/src/somefolder/srcfile.ts",
+  "/user/username/projects/myproject/src/typings/electron.d.ts"
+ ],
+ "options": {
+  "module": 2,
+  "moduleResolution": 1,
+  "target": 1,
+  "outDir": "/user/username/projects/myproject/out",
+  "baseUrl": "/user/username/projects/myproject/src",
+  "typeRoots": [
+   "/user/username/projects/myproject/src/typings"
+  ],
+  "configFilePath": "/user/username/projects/myproject/src/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 undefined Config: /user/username/projects/myproject/src/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 undefined Config: /user/username/projects/myproject/src/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/somefolder/module1.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings/electron.d.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/somefolder 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/somefolder 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/somefolder 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/somefolder 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/node_modules 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/node_modules 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 0 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 0 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/src/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/src/somefolder/module1.ts
+	/user/username/projects/myproject/src/somefolder/srcfile.ts
+	/user/username/projects/myproject/src/typings/electron.d.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	somefolder/module1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	  Imported via "somefolder/module1" from file 'somefolder/srcfile.ts'
+	somefolder/srcfile.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	typings/electron.d.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/src/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/somefolder/srcfile.ts ProjectRootPath: /user/username/projects/myproject
+		Projects: /user/username/projects/myproject/src/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js
new file mode 100644
index 0000000000000..541eaca466725
--- /dev/null
+++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolves-to-ambient-module.js
@@ -0,0 +1,72 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/src/somefolder
+For info: /user/username/projects/myproject/src/somefolder/srcfile.ts :: Config file name: /user/username/projects/myproject/src/tsconfig.json
+Creating configuration project /user/username/projects/myproject/src/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/src/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/src/somefolder/module1.ts",
+  "/user/username/projects/myproject/src/somefolder/srcfile.ts",
+  "/user/username/projects/myproject/src/typings/electron.d.ts",
+  "/user/username/projects/myproject/src/typings/node.d.ts"
+ ],
+ "options": {
+  "module": 2,
+  "moduleResolution": 1,
+  "target": 1,
+  "outDir": "/user/username/projects/myproject/out",
+  "baseUrl": "/user/username/projects/myproject/src",
+  "typeRoots": [
+   "/user/username/projects/myproject/src/typings"
+  ],
+  "configFilePath": "/user/username/projects/myproject/src/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 undefined Config: /user/username/projects/myproject/src/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 undefined Config: /user/username/projects/myproject/src/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/somefolder/module1.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings/electron.d.ts 500 undefined WatchType: Closed Script info
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings/node.d.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/somefolder 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/somefolder 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/somefolder 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/somefolder 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/node_modules 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/node_modules 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/typings 1 undefined Project: /user/username/projects/myproject/src/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/src/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/src/tsconfig.json' (Configured)
+	Files (5)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/src/somefolder/module1.ts
+	/user/username/projects/myproject/src/somefolder/srcfile.ts
+	/user/username/projects/myproject/src/typings/electron.d.ts
+	/user/username/projects/myproject/src/typings/node.d.ts
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	somefolder/module1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	  Imported via "somefolder/module1" from file 'somefolder/srcfile.ts'
+	somefolder/srcfile.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	typings/electron.d.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	typings/node.d.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/src/tsconfig.json' (Configured)
+	Files (5)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/somefolder/srcfile.ts ProjectRootPath: /user/username/projects/myproject
+		Projects: /user/username/projects/myproject/src/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/syntacticServer/files-go-to-inferred-project-and-semantic-operations-fail.js b/tests/baselines/reference/tsserver/syntacticServer/files-go-to-inferred-project-and-semantic-operations-fail.js
new file mode 100644
index 0000000000000..dc090f2828f89
--- /dev/null
+++ b/tests/baselines/reference/tsserver/syntacticServer/files-go-to-inferred-project-and-semantic-operations-fail.js
@@ -0,0 +1,108 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/a.ts"}}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: false Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
+request:{"command":"completions","arguments":{"file":"/user/username/projects/myproject/a.ts","line":3,"offset":47},"seq":1,"type":"request"}
+Request: completions not allowed in LanguageServiceMode.Syntactic
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/a.ts","line":1,"offset":10},"seq":2,"type":"request"}
+Request: definitionAndBoundSpan not allowed in LanguageServiceMode.Syntactic
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/b.ts"}}
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 2 structureChanged: false Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /user/username/projects/myproject/b.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
+request:{"command":"completions","arguments":{"file":"/user/username/projects/myproject/a.ts","line":3,"offset":47},"seq":3,"type":"request"}
+Request: completions not allowed in LanguageServiceMode.Syntactic
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/a.ts","line":1,"offset":10},"seq":4,"type":"request"}
+Request: definitionAndBoundSpan not allowed in LanguageServiceMode.Syntactic
+request:{"command":"definitionAndBoundSpan","arguments":{"file":"/user/username/projects/myproject/a.ts","line":1,"offset":13},"seq":5,"type":"request"}
+Request: definitionAndBoundSpan not allowed in LanguageServiceMode.Syntactic
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/c.ts"}}
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 3 structureChanged: false Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /user/username/projects/myproject/b.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /user/username/projects/myproject/c.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/node_modules/something/index.d.ts"}}
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 4 structureChanged: false Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /user/username/projects/myproject/b.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /user/username/projects/myproject/c.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /user/username/projects/myproject/node_modules/something/index.d.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/c.ts"}}
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /user/username/projects/myproject/b.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /user/username/projects/myproject/node_modules/something/index.d.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"close","arguments":{"file":"/user/username/projects/myproject/b.ts"}}
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+	FileName: /user/username/projects/myproject/node_modules/something/index.d.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/syntacticServer/should-not-include-auto-type-reference-directives.js b/tests/baselines/reference/tsserver/syntacticServer/should-not-include-auto-type-reference-directives.js
new file mode 100644
index 0000000000000..33609452a6848
--- /dev/null
+++ b/tests/baselines/reference/tsserver/syntacticServer/should-not-include-auto-type-reference-directives.js
@@ -0,0 +1,17 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/a.ts"}}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: false Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/syntacticServer/throws-on-unsupported-commands.js b/tests/baselines/reference/tsserver/syntacticServer/throws-on-unsupported-commands.js
new file mode 100644
index 0000000000000..d5f0e057ff621
--- /dev/null
+++ b/tests/baselines/reference/tsserver/syntacticServer/throws-on-unsupported-commands.js
@@ -0,0 +1,20 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/user/username/projects/myproject/a.ts"}}
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: false Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (0) NoProgram
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/a.ts ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+response:{"responseRequired":false}
+request:{"type":"request","seq":1,"command":"semanticDiagnosticsSync","arguments":{"file":"/user/username/projects/myproject/a.ts"}}
+Request: semanticDiagnosticsSync not allowed in LanguageServiceMode.Syntactic
+LanguageService Operation: getSemanticDiagnostics not allowed in LanguageServiceMode.Syntactic
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js
new file mode 100644
index 0000000000000..db9657c21e654
--- /dev/null
+++ b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects-discover-from-bower_components.js
@@ -0,0 +1,101 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /
+For info: /app.js :: Config file name: /jsconfig.json
+Creating configuration project /jsconfig.json
+FileWatcher:: Added:: WatchInfo: /jsconfig.json 2000 undefined Project: /jsconfig.json WatchType: Config file
+Config: /jsconfig.json : {
+ "rootNames": [
+  "/app.js"
+ ],
+ "options": {
+  "allowJs": true,
+  "maxNodeModuleJsDepth": 2,
+  "allowSyntheticDefaultImports": true,
+  "skipLibCheck": true,
+  "noEmit": true,
+  "configFilePath": "/jsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /jsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /jsconfig.json WatchType: Missing file
+Finishing updateGraphWorker: Project: /jsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/jsconfig.json' (Configured)
+	Files (1)
+	/app.js
+
+
+	app.js
+	  Matched by include pattern '**/*' in 'jsconfig.json'
+
+-----------------------------------------------
+DirectoryWatcher:: Triggered with tmp :: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+Scheduled: /jsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms DirectoryWatcher:: Triggered with tmp :: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+Config: /jsconfig.json Detected new package.json: tmp/package.json
+FileWatcher:: Added:: WatchInfo: /tmp/package.json 250 undefined WatchType: package.json file
+Project: /jsconfig.json Detected file add/remove of non supported extension: tmp/package.json
+Elapsed:: *ms DirectoryWatcher:: Triggered with tmp/package.json :: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+Starting updateGraphWorker: Project: /jsconfig.json
+Finishing updateGraphWorker: Project: /jsconfig.json Version: 2 structureChanged: false structureIsReused:: Not Elapsed:: *ms
+Project '/jsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /app.js ProjectRootPath: undefined
+		Projects: /jsconfig.json
+DirectoryWatcher:: Triggered with tmp/node_modules :: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+Scheduled: /jsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with tmp/node_modules :: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with tmp/node_modules/@types :: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+Scheduled: /jsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with tmp/node_modules/@types :: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with tmp/node_modules/@types/jquery :: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+Scheduled: /jsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with tmp/node_modules/@types/jquery :: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with tmp/node_modules/@types/jquery/index.d.ts :: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+Scheduled: /jsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with tmp/node_modules/@types/jquery/index.d.ts :: WatchInfo:  1 undefined Config: /jsconfig.json WatchType: Wild card directory
+Scheduled: /jsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Running: /jsconfig.json
+Starting updateGraphWorker: Project: /jsconfig.json
+Finishing updateGraphWorker: Project: /jsconfig.json Version: 3 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/jsconfig.json' (Configured)
+	Files (2)
+	/app.js
+	/tmp/node_modules/@types/jquery/index.d.ts
+
+
+	app.js
+	  Matched by include pattern '**/*' in 'jsconfig.json'
+	tmp/node_modules/@types/jquery/index.d.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/jsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /app.js ProjectRootPath: undefined
+		Projects: /jsconfig.json
+After ensureProjectForOpenFiles:
+Project '/jsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /app.js ProjectRootPath: undefined
+		Projects: /jsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/configured-projects.js b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects.js
new file mode 100644
index 0000000000000..9ebad3b05fc96
--- /dev/null
+++ b/tests/baselines/reference/tsserver/typingsInstaller/configured-projects.js
@@ -0,0 +1,72 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/b
+For info: /a/b/app.js :: Config file name: /a/b/tsconfig.json
+Creating configuration project /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/app.js"
+ ],
+ "options": {
+  "allowJs": true,
+  "configFilePath": "/a/b/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 1 undefined Config: /a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/b/tsconfig.json WatchType: Missing file
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 undefined Project: /a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (1)
+	/a/b/app.js
+
+
+	app.js
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (1)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/app.js ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+Scheduled: /a/b/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Running: /a/b/tsconfig.json
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (2)
+	/a/b/app.js
+	/a/data/node_modules/@types/jquery/index.d.ts
+
+
+	app.js
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	../data/node_modules/@types/jquery/index.d.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/a/b/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/app.js ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/a/b/tsconfig.json' (Configured)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/app.js ProjectRootPath: undefined
+		Projects: /a/b/tsconfig.json
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/typingsInstaller/redo-resolutions-pointing-to-js-on-typing-install.js b/tests/baselines/reference/tsserver/typingsInstaller/redo-resolutions-pointing-to-js-on-typing-install.js
new file mode 100644
index 0000000000000..504b10cd236ba
--- /dev/null
+++ b/tests/baselines/reference/tsserver/typingsInstaller/redo-resolutions-pointing-to-js-on-typing-install.js
@@ -0,0 +1,62 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/a/b
+For info: /user/username/projects/a/b/app.js :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/a/b/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/a/b/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/a/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/a/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/a/b/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/a/b/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/a/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/a/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /dev/null/inferredProject1* WatchType: Missing file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/a/b/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/a/b/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/a/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/a/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/user/username/projects/node_modules/commander/index.js
+	/user/username/projects/a/b/app.js
+
+
+	../../node_modules/commander/index.js
+	  Imported via "commander" from file 'app.js'
+	app.js
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/a/b/app.js ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+Scheduled: /dev/null/inferredProject1*
+Scheduled: *ensureProjectForOpenFiles*
+Running: /dev/null/inferredProject1*
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/a/cache/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/a/cache/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/user/username/projects/a/cache/node_modules/@types/commander/index.d.ts
+	/user/username/projects/a/b/app.js
+
+
+	../cache/node_modules/@types/commander/index.d.ts
+	  Imported via "commander" from file 'app.js'
+	  Root file specified for compilation
+	app.js
+	  Root file specified for compilation
+
+-----------------------------------------------
+Scheduled: /dev/null/inferredProject1*
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options-in-host-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options-in-host-configuration.js
new file mode 100644
index 0000000000000..9e3f0fcc1e202
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options-in-host-configuration.js
@@ -0,0 +1,50 @@
+Provided types map file "/typesMap.json" doesn't exist
+Host watch options changed to {"excludeDirectories":["node_modules"]}, it will be take effect for next watches.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/main.ts 500 {"excludeDirectories":["node_modules"]} WatchType: Closed Script info
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 {"excludeDirectories":["node_modules"]} WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Starting updateGraphWorker: Project: /user/username/projects/myproject/project.csproj
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/project.csproj WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 {"excludeDirectories":["node_modules"]} WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/project.csproj WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/project.csproj WatchType: Failed Lookup Locations
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/project.csproj WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/project.csproj Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/project.csproj' (External)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/node_modules/bar/foo.d.ts
+	/user/username/projects/myproject/node_modules/bar/index.d.ts
+	/user/username/projects/myproject/src/main.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	node_modules/bar/foo.d.ts
+	  Imported via "./foo" from file 'node_modules/bar/index.d.ts'
+	  Imported via "./foo" from file 'node_modules/bar/index.d.ts'
+	  Root file specified for compilation
+	node_modules/bar/index.d.ts
+	  Imported via "bar" from file 'src/main.ts'
+	  Root file specified for compilation
+	src/main.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/src/main.ts 500 {"excludeDirectories":["node_modules"]} WatchType: Closed Script info
+Project '/user/username/projects/myproject/project.csproj' (External)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/project.csproj
+WatchedFiles::
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+/user/username/projects/myproject/src:
+  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options.js b/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options.js
new file mode 100644
index 0000000000000..92afe44b7ed76
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options.js
@@ -0,0 +1,52 @@
+Provided types map file "/typesMap.json" doesn't exist
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/main.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Starting updateGraphWorker: Project: /user/username/projects/myproject/project.csproj
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/project.csproj WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/project.csproj WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/project.csproj WatchType: Failed Lookup Locations
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/project.csproj WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/project.csproj Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/project.csproj' (External)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/node_modules/bar/foo.d.ts
+	/user/username/projects/myproject/node_modules/bar/index.d.ts
+	/user/username/projects/myproject/src/main.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	node_modules/bar/foo.d.ts
+	  Imported via "./foo" from file 'node_modules/bar/index.d.ts'
+	  Imported via "./foo" from file 'node_modules/bar/index.d.ts'
+	  Root file specified for compilation
+	node_modules/bar/index.d.ts
+	  Imported via "bar" from file 'src/main.ts'
+	  Root file specified for compilation
+	src/main.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/src/main.ts 500 undefined WatchType: Closed Script info
+Project '/user/username/projects/myproject/project.csproj' (External)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/project.csproj
+WatchedFiles::
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+/user/username/projects/myproject/node_modules:
+  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/user/username/projects/myproject/src:
+  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/files-at-root.js b/tests/baselines/reference/tsserver/watchEnvironment/files-at-root.js
new file mode 100644
index 0000000000000..fa47642a988b0
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/files-at-root.js
@@ -0,0 +1,60 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: c:/project
+For info: c:/project/file1.ts :: Config file name: c:/project/tsconfig.json
+Creating configuration project c:/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: c:/project/tsconfig.json 2000 undefined Project: c:/project/tsconfig.json WatchType: Config file
+Config: c:/project/tsconfig.json : {
+ "rootNames": [
+  "c:/project/file1.ts",
+  "c:/project/file2.ts"
+ ],
+ "options": {
+  "configFilePath": "c:/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: c:/project 1 undefined Config: c:/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/project 1 undefined Config: c:/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: c:/project/file2.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: c:/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: c:/a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: c:/project/node_modules/@types 1 undefined Project: c:/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/project/node_modules/@types 1 undefined Project: c:/project/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: c:/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project 'c:/project/tsconfig.json' (Configured)
+	Files (3)
+	c:/a/lib/lib.d.ts
+	c:/project/file1.ts
+	c:/project/file2.ts
+
+
+	../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project 'c:/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: c:/project/file1.ts ProjectRootPath: undefined
+		Projects: c:/project/tsconfig.json
+WatchedFiles::
+c:/project/tsconfig.json:
+  {"fileName":"c:/project/tsconfig.json","pollingInterval":250}
+c:/project/file2.ts:
+  {"fileName":"c:/project/file2.ts","pollingInterval":250}
+c:/a/lib/lib.d.ts:
+  {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+c:/project:
+  {"directoryName":"c:/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+c:/project/node_modules/@types:
+  {"directoryName":"c:/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/files-at-windows-style-root.js b/tests/baselines/reference/tsserver/watchEnvironment/files-at-windows-style-root.js
new file mode 100644
index 0000000000000..fa47642a988b0
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/files-at-windows-style-root.js
@@ -0,0 +1,60 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: c:/project
+For info: c:/project/file1.ts :: Config file name: c:/project/tsconfig.json
+Creating configuration project c:/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: c:/project/tsconfig.json 2000 undefined Project: c:/project/tsconfig.json WatchType: Config file
+Config: c:/project/tsconfig.json : {
+ "rootNames": [
+  "c:/project/file1.ts",
+  "c:/project/file2.ts"
+ ],
+ "options": {
+  "configFilePath": "c:/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: c:/project 1 undefined Config: c:/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/project 1 undefined Config: c:/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: c:/project/file2.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: c:/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: c:/a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: c:/project/node_modules/@types 1 undefined Project: c:/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/project/node_modules/@types 1 undefined Project: c:/project/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: c:/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project 'c:/project/tsconfig.json' (Configured)
+	Files (3)
+	c:/a/lib/lib.d.ts
+	c:/project/file1.ts
+	c:/project/file2.ts
+
+
+	../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project 'c:/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: c:/project/file1.ts ProjectRootPath: undefined
+		Projects: c:/project/tsconfig.json
+WatchedFiles::
+c:/project/tsconfig.json:
+  {"fileName":"c:/project/tsconfig.json","pollingInterval":250}
+c:/project/file2.ts:
+  {"fileName":"c:/project/file2.ts","pollingInterval":250}
+c:/a/lib/lib.d.ts:
+  {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+c:/project:
+  {"directoryName":"c:/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+c:/project/node_modules/@types:
+  {"directoryName":"c:/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-root.js b/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-root.js
new file mode 100644
index 0000000000000..91486537af12f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-root.js
@@ -0,0 +1,64 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: c:/myfolder/allproject/project
+For info: c:/myfolder/allproject/project/file1.ts :: Config file name: c:/myfolder/allproject/project/tsconfig.json
+Creating configuration project c:/myfolder/allproject/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: c:/myfolder/allproject/project/tsconfig.json 2000 undefined Project: c:/myfolder/allproject/project/tsconfig.json WatchType: Config file
+Config: c:/myfolder/allproject/project/tsconfig.json : {
+ "rootNames": [
+  "c:/myfolder/allproject/project/file1.ts",
+  "c:/myfolder/allproject/project/file2.ts"
+ ],
+ "options": {
+  "configFilePath": "c:/myfolder/allproject/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: c:/myfolder/allproject/project 1 undefined Config: c:/myfolder/allproject/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/myfolder/allproject/project 1 undefined Config: c:/myfolder/allproject/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: c:/myfolder/allproject/project/file2.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: c:/myfolder/allproject/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: c:/a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: c:/myfolder/allproject/project/node_modules/@types 1 undefined Project: c:/myfolder/allproject/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/myfolder/allproject/project/node_modules/@types 1 undefined Project: c:/myfolder/allproject/project/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: c:/myfolder/allproject/node_modules/@types 1 undefined Project: c:/myfolder/allproject/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/myfolder/allproject/node_modules/@types 1 undefined Project: c:/myfolder/allproject/project/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: c:/myfolder/allproject/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project 'c:/myfolder/allproject/project/tsconfig.json' (Configured)
+	Files (3)
+	c:/a/lib/lib.d.ts
+	c:/myfolder/allproject/project/file1.ts
+	c:/myfolder/allproject/project/file2.ts
+
+
+	../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project 'c:/myfolder/allproject/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: c:/myfolder/allproject/project/file1.ts ProjectRootPath: undefined
+		Projects: c:/myfolder/allproject/project/tsconfig.json
+WatchedFiles::
+c:/myfolder/allproject/project/tsconfig.json:
+  {"fileName":"c:/myfolder/allproject/project/tsconfig.json","pollingInterval":250}
+c:/myfolder/allproject/project/file2.ts:
+  {"fileName":"c:/myfolder/allproject/project/file2.ts","pollingInterval":250}
+c:/a/lib/lib.d.ts:
+  {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+c:/myfolder/allproject/project:
+  {"directoryName":"c:/myfolder/allproject/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+c:/myfolder/allproject/project/node_modules/@types:
+  {"directoryName":"c:/myfolder/allproject/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+c:/myfolder/allproject/node_modules/@types:
+  {"directoryName":"c:/myfolder/allproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-windows-style-root.js b/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-windows-style-root.js
new file mode 100644
index 0000000000000..91486537af12f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-windows-style-root.js
@@ -0,0 +1,64 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: c:/myfolder/allproject/project
+For info: c:/myfolder/allproject/project/file1.ts :: Config file name: c:/myfolder/allproject/project/tsconfig.json
+Creating configuration project c:/myfolder/allproject/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: c:/myfolder/allproject/project/tsconfig.json 2000 undefined Project: c:/myfolder/allproject/project/tsconfig.json WatchType: Config file
+Config: c:/myfolder/allproject/project/tsconfig.json : {
+ "rootNames": [
+  "c:/myfolder/allproject/project/file1.ts",
+  "c:/myfolder/allproject/project/file2.ts"
+ ],
+ "options": {
+  "configFilePath": "c:/myfolder/allproject/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: c:/myfolder/allproject/project 1 undefined Config: c:/myfolder/allproject/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/myfolder/allproject/project 1 undefined Config: c:/myfolder/allproject/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: c:/myfolder/allproject/project/file2.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: c:/myfolder/allproject/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: c:/a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: c:/myfolder/allproject/project/node_modules/@types 1 undefined Project: c:/myfolder/allproject/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/myfolder/allproject/project/node_modules/@types 1 undefined Project: c:/myfolder/allproject/project/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Added:: WatchInfo: c:/myfolder/allproject/node_modules/@types 1 undefined Project: c:/myfolder/allproject/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/myfolder/allproject/node_modules/@types 1 undefined Project: c:/myfolder/allproject/project/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: c:/myfolder/allproject/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project 'c:/myfolder/allproject/project/tsconfig.json' (Configured)
+	Files (3)
+	c:/a/lib/lib.d.ts
+	c:/myfolder/allproject/project/file1.ts
+	c:/myfolder/allproject/project/file2.ts
+
+
+	../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	file2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project 'c:/myfolder/allproject/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: c:/myfolder/allproject/project/file1.ts ProjectRootPath: undefined
+		Projects: c:/myfolder/allproject/project/tsconfig.json
+WatchedFiles::
+c:/myfolder/allproject/project/tsconfig.json:
+  {"fileName":"c:/myfolder/allproject/project/tsconfig.json","pollingInterval":250}
+c:/myfolder/allproject/project/file2.ts:
+  {"fileName":"c:/myfolder/allproject/project/file2.ts","pollingInterval":250}
+c:/a/lib/lib.d.ts:
+  {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+c:/myfolder/allproject/project:
+  {"directoryName":"c:/myfolder/allproject/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+c:/myfolder/allproject/project/node_modules/@types:
+  {"directoryName":"c:/myfolder/allproject/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+c:/myfolder/allproject/node_modules/@types:
+  {"directoryName":"c:/myfolder/allproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options-in-host-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options-in-host-configuration.js
new file mode 100644
index 0000000000000..a483b20eca2b2
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options-in-host-configuration.js
@@ -0,0 +1,59 @@
+Provided types map file "/typesMap.json" doesn't exist
+Host watch options changed to {"excludeDirectories":["node_modules"]}, it will be take effect for next watches.
+Search path: /user/username/projects/myproject/src
+For info: /user/username/projects/myproject/src/main.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/tsconfig.json 2000 {"excludeDirectories":["node_modules"]} WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/jsconfig.json 2000 {"excludeDirectories":["node_modules"]} WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 {"excludeDirectories":["node_modules"]} WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/jsconfig.json 2000 {"excludeDirectories":["node_modules"]} WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 {"excludeDirectories":["node_modules"]} WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 {"excludeDirectories":["node_modules"]} WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/node_modules/bar/foo.d.ts
+	/user/username/projects/myproject/node_modules/bar/index.d.ts
+	/user/username/projects/myproject/src/main.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	node_modules/bar/foo.d.ts
+	  Imported via "./foo" from file 'node_modules/bar/index.d.ts'
+	node_modules/bar/index.d.ts
+	  Imported via "bar" from file 'src/main.ts'
+	src/main.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/main.ts ProjectRootPath: /user/username/projects/myproject
+		Projects: /dev/null/inferredProject1*
+WatchedFiles::
+/user/username/projects/myproject/src/tsconfig.json:
+  {"fileName":"/user/username/projects/myproject/src/tsconfig.json","pollingInterval":250}
+/user/username/projects/myproject/src/jsconfig.json:
+  {"fileName":"/user/username/projects/myproject/src/jsconfig.json","pollingInterval":250}
+/user/username/projects/myproject/tsconfig.json:
+  {"fileName":"/user/username/projects/myproject/tsconfig.json","pollingInterval":250}
+/user/username/projects/myproject/jsconfig.json:
+  {"fileName":"/user/username/projects/myproject/jsconfig.json","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+/user/username/projects/myproject/src:
+  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options.js b/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options.js
new file mode 100644
index 0000000000000..520b052373644
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options.js
@@ -0,0 +1,61 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/src
+For info: /user/username/projects/myproject/src/main.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/node_modules/bar/foo.d.ts
+	/user/username/projects/myproject/node_modules/bar/index.d.ts
+	/user/username/projects/myproject/src/main.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	node_modules/bar/foo.d.ts
+	  Imported via "./foo" from file 'node_modules/bar/index.d.ts'
+	node_modules/bar/index.d.ts
+	  Imported via "bar" from file 'src/main.ts'
+	src/main.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/main.ts ProjectRootPath: /user/username/projects/myproject
+		Projects: /dev/null/inferredProject1*
+WatchedFiles::
+/user/username/projects/myproject/src/tsconfig.json:
+  {"fileName":"/user/username/projects/myproject/src/tsconfig.json","pollingInterval":250}
+/user/username/projects/myproject/src/jsconfig.json:
+  {"fileName":"/user/username/projects/myproject/src/jsconfig.json","pollingInterval":250}
+/user/username/projects/myproject/tsconfig.json:
+  {"fileName":"/user/username/projects/myproject/tsconfig.json","pollingInterval":250}
+/user/username/projects/myproject/jsconfig.json:
+  {"fileName":"/user/username/projects/myproject/jsconfig.json","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+/user/username/projects/myproject/node_modules:
+  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/user/username/projects/myproject/src:
+  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names-with-i.js b/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names-with-i.js
new file mode 100644
index 0000000000000..93d609f4f7926
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names-with-i.js
@@ -0,0 +1,47 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /User/userName/Projects/i
+For info: /User/userName/Projects/i/foo.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /User/userName/Projects/i/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /User/userName/Projects/i/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /User/userName/Projects/i/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /User/userName/Projects/i/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /User/userName/Projects/i/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /User/userName/Projects/i/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/User/userName/Projects/i/foo.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	foo.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /User/userName/Projects/i/foo.ts ProjectRootPath: /User/userName/Projects/i
+		Projects: /dev/null/inferredProject1*
+WatchedFiles::
+/user/username/projects/i/tsconfig.json:
+  {"fileName":"/User/userName/Projects/i/tsconfig.json","pollingInterval":250}
+/user/username/projects/i/jsconfig.json:
+  {"fileName":"/User/userName/Projects/i/jsconfig.json","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+/user/username/projects/i/node_modules:
+  {"directoryName":"/User/userName/Projects/i/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/user/username/projects/i/node_modules/@types:
+  {"directoryName":"/User/userName/Projects/i/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names.js b/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names.js
new file mode 100644
index 0000000000000..66595cfcd6c95
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names.js
@@ -0,0 +1,47 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /User/userName/Projects/I
+For info: /User/userName/Projects/I/foo.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /User/userName/Projects/I/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /User/userName/Projects/I/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /User/userName/Projects/I/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /User/userName/Projects/I/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /User/userName/Projects/I/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /User/userName/Projects/I/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/User/userName/Projects/I/foo.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	foo.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /User/userName/Projects/I/foo.ts ProjectRootPath: /User/userName/Projects/I
+		Projects: /dev/null/inferredProject1*
+WatchedFiles::
+/user/username/projects/i/tsconfig.json:
+  {"fileName":"/User/userName/Projects/I/tsconfig.json","pollingInterval":250}
+/user/username/projects/i/jsconfig.json:
+  {"fileName":"/User/userName/Projects/I/jsconfig.json","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+/user/username/projects/i/node_modules:
+  {"directoryName":"/User/userName/Projects/I/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/user/username/projects/i/node_modules/@types:
+  {"directoryName":"/User/userName/Projects/I/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/project-with-unicode-file-names.js b/tests/baselines/reference/tsserver/watchEnvironment/project-with-unicode-file-names.js
new file mode 100644
index 0000000000000..23f826fb03efc
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/project-with-unicode-file-names.js
@@ -0,0 +1,47 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /User/userName/Projects/İ
+For info: /User/userName/Projects/İ/foo.ts :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /User/userName/Projects/İ/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: /User/userName/Projects/İ/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /User/userName/Projects/İ/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /User/userName/Projects/İ/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /User/userName/Projects/İ/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /User/userName/Projects/İ/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	/a/lib/lib.d.ts
+	/User/userName/Projects/İ/foo.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	foo.ts
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: /User/userName/Projects/İ/foo.ts ProjectRootPath: /User/userName/Projects/İ
+		Projects: /dev/null/inferredProject1*
+WatchedFiles::
+/user/username/projects/İ/tsconfig.json:
+  {"fileName":"/User/userName/Projects/İ/tsconfig.json","pollingInterval":250}
+/user/username/projects/İ/jsconfig.json:
+  {"fileName":"/User/userName/Projects/İ/jsconfig.json","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+/user/username/projects/İ/node_modules:
+  {"directoryName":"/User/userName/Projects/İ/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/user/username/projects/İ/node_modules/@types:
+  {"directoryName":"/User/userName/Projects/İ/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js b/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js
new file mode 100644
index 0000000000000..458dc2e274a6f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js
@@ -0,0 +1,188 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/username/project/src
+For info: /a/username/project/src/index.ts :: Config file name: /a/username/project/tsconfig.json
+Creating configuration project /a/username/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/username/project/tsconfig.json 2000 undefined Project: /a/username/project/tsconfig.json WatchType: Config file
+Config: /a/username/project/tsconfig.json : {
+ "rootNames": [
+  "/a/username/project/src/file1.ts",
+  "/a/username/project/src/index.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/username/project/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/username/project 1 undefined Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/username/project 1 undefined Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/username/project/src/file1.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/username/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/username/project/src 1 undefined Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/username/project/src 1 undefined Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /a/username/project/node_modules 1 undefined Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/username/project/node_modules 1 undefined Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Added:: WatchInfo: /a/username/project/node_modules/@types 1 undefined Project: /a/username/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/username/project/node_modules/@types 1 undefined Project: /a/username/project/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/username/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/username/project/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/username/project/src/file1.ts
+	/a/username/project/src/index.ts
+
+
+	../../lib/lib.d.ts
+	  Default library for target 'es3'
+	src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	src/index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/username/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/username/project/src/index.ts ProjectRootPath: undefined
+		Projects: /a/username/project/tsconfig.json
+WatchedFiles::
+/a/username/project/tsconfig.json:
+  {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
+/a/username/project/src/file1.ts:
+  {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+/a/username/project:
+  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules:
+  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/src:
+  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules/@types:
+  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+FsWatchesRecursive::
+
+WatchedFiles::
+/a/username/project/tsconfig.json:
+  {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
+/a/username/project/src/file1.ts:
+  {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+/a/username/project:
+  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules:
+  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/src:
+  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules/@types:
+  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+FsWatchesRecursive::
+
+WatchedFiles::
+/a/username/project/tsconfig.json:
+  {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
+/a/username/project/src/file1.ts:
+  {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+/a/username/project:
+  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules:
+  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/src:
+  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules/@types:
+  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+FsWatchesRecursive::
+
+WatchedFiles::
+/a/username/project/tsconfig.json:
+  {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
+/a/username/project/src/file1.ts:
+  {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+/a/username/project:
+  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules:
+  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/src:
+  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules/@types:
+  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+FsWatchesRecursive::
+
+WatchedFiles::
+/a/username/project/tsconfig.json:
+  {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
+/a/username/project/src/file1.ts:
+  {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+/a/username/project:
+  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules:
+  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/src:
+  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules/@types:
+  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+FsWatchesRecursive::
+
+WatchedFiles::
+/a/username/project/tsconfig.json:
+  {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
+/a/username/project/src/file1.ts:
+  {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+/a/username/project:
+  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules:
+  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/src:
+  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules/@types:
+  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+FsWatchesRecursive::
+
+WatchedFiles::
+/a/username/project/tsconfig.json:
+  {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
+/a/username/project/src/file1.ts:
+  {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+/a/username/project:
+  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules:
+  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/src:
+  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules/@types:
+  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+FsWatchesRecursive::
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js
new file mode 100644
index 0000000000000..df2213e58f072
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js
@@ -0,0 +1,110 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/username/project/src
+For info: /a/username/project/src/index.ts :: Config file name: /a/username/project/tsconfig.json
+Creating configuration project /a/username/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/username/project/tsconfig.json 2000 undefined Project: /a/username/project/tsconfig.json WatchType: Config file
+Config: /a/username/project/tsconfig.json : {
+ "rootNames": [
+  "/a/username/project/src/file1.ts",
+  "/a/username/project/src/index.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/username/project/tsconfig.json"
+ },
+ "watchOptions": {
+  "synchronousWatchDirectory": true
+ }
+}
+FileWatcher:: Close:: WatchInfo: /a/username/project/tsconfig.json 2000 undefined Project: /a/username/project/tsconfig.json WatchType: Config file
+FileWatcher:: Added:: WatchInfo: /a/username/project/tsconfig.json 2000 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /a/username/project 1 {"synchronousWatchDirectory":true} Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/username/project 1 {"synchronousWatchDirectory":true} Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/username/project/src/file1.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/username/project/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/username/project/node_modules/@types 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/username/project/node_modules/@types 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/username/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/username/project/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/username/project/src/file1.ts
+	/a/username/project/src/index.ts
+
+
+	../../lib/lib.d.ts
+	  Default library for target 'es3'
+	src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	src/index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	  Imported via "./" from file 'src/index.ts'
+
+-----------------------------------------------
+Project '/a/username/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/username/project/src/index.ts ProjectRootPath: undefined
+		Projects: /a/username/project/tsconfig.json
+Completion Entries:: ["file1"]
+WatchedFiles::
+/a/username/project/tsconfig.json:
+  {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
+/a/username/project/src/file1.ts:
+  {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+
+DirectoryWatcher:: Triggered with /a/username/project/src :: WatchInfo: /a/username/project 1 {"synchronousWatchDirectory":true} Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+Scheduled: /a/username/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms DirectoryWatcher:: Triggered with /a/username/project/src :: WatchInfo: /a/username/project 1 {"synchronousWatchDirectory":true} Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /a/username/project/src :: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /a/username/project/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /a/username/project/src :: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+FileWatcher:: Added:: WatchInfo: /a/username/project/src/file2.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/username/project/tsconfig.json
+Finishing updateGraphWorker: Project: /a/username/project/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/username/project/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.d.ts
+	/a/username/project/src/file1.ts
+	/a/username/project/src/index.ts
+	/a/username/project/src/file2.ts
+
+
+	../../lib/lib.d.ts
+	  Default library for target 'es3'
+	src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	src/index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	  Imported via "./" from file 'src/index.ts'
+	src/file2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Completion Entries:: ["file1","file2"]
+WatchedFiles::
+/a/username/project/tsconfig.json:
+  {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
+/a/username/project/src/file1.ts:
+  {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/src/file2.ts:
+  {"fileName":"/a/username/project/src/file2.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js
new file mode 100644
index 0000000000000..f70281424f0a5
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js
@@ -0,0 +1,139 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/username/project/src
+For info: /a/username/project/src/index.ts :: Config file name: /a/username/project/tsconfig.json
+Creating configuration project /a/username/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/username/project/tsconfig.json 2000 undefined Project: /a/username/project/tsconfig.json WatchType: Config file
+Config: /a/username/project/tsconfig.json : {
+ "rootNames": [
+  "/a/username/project/src/file1.ts",
+  "/a/username/project/src/index.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/username/project/tsconfig.json"
+ },
+ "watchOptions": {
+  "synchronousWatchDirectory": true
+ }
+}
+FileWatcher:: Close:: WatchInfo: /a/username/project/tsconfig.json 2000 undefined Project: /a/username/project/tsconfig.json WatchType: Config file
+FileWatcher:: Added:: WatchInfo: /a/username/project/tsconfig.json 2000 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /a/username/project 1 {"synchronousWatchDirectory":true} Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/username/project 1 {"synchronousWatchDirectory":true} Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/username/project/src/file1.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/username/project/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/username/project/node_modules/@types 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/username/project/node_modules/@types 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/username/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/username/project/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/username/project/src/file1.ts
+	/a/username/project/src/index.ts
+
+
+	../../lib/lib.d.ts
+	  Default library for target 'es3'
+	src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	src/index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	  Imported via "./" from file 'src/index.ts'
+
+-----------------------------------------------
+Project '/a/username/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/username/project/src/index.ts ProjectRootPath: undefined
+		Projects: /a/username/project/tsconfig.json
+Completion Entries:: ["file1"]
+WatchedFiles::
+/a/username/project/tsconfig.json:
+  {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
+/a/username/project/src/file1.ts:
+  {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+/a/username/project:
+  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/src:
+  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules/@types:
+  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+FsWatchesRecursive::
+
+DirectoryWatcher:: Triggered with /a/username/project/src/file2.ts :: WatchInfo: /a/username/project 1 {"synchronousWatchDirectory":true} Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+Scheduled: /a/username/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms DirectoryWatcher:: Triggered with /a/username/project/src/file2.ts :: WatchInfo: /a/username/project 1 {"synchronousWatchDirectory":true} Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /a/username/project/src/file2.ts :: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /a/username/project/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /a/username/project/src/file2.ts :: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+Running: /a/username/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/username/project/src/file2.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/username/project/tsconfig.json
+Finishing updateGraphWorker: Project: /a/username/project/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/username/project/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.d.ts
+	/a/username/project/src/file1.ts
+	/a/username/project/src/index.ts
+	/a/username/project/src/file2.ts
+
+
+	../../lib/lib.d.ts
+	  Default library for target 'es3'
+	src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	src/index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	  Imported via "./" from file 'src/index.ts'
+	src/file2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Running: *ensureProjectForOpenFiles*
+Before ensureProjectForOpenFiles:
+Project '/a/username/project/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/username/project/src/index.ts ProjectRootPath: undefined
+		Projects: /a/username/project/tsconfig.json
+After ensureProjectForOpenFiles:
+Project '/a/username/project/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/username/project/src/index.ts ProjectRootPath: undefined
+		Projects: /a/username/project/tsconfig.json
+Completion Entries:: ["file1","file2"]
+WatchedFiles::
+/a/username/project/tsconfig.json:
+  {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
+/a/username/project/src/file1.ts:
+  {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/src/file2.ts:
+  {"fileName":"/a/username/project/src/file2.ts","pollingInterval":250}
+
+FsWatches::
+/a/username/project:
+  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/src:
+  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/username/project/node_modules/@types:
+  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+FsWatchesRecursive::
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js
new file mode 100644
index 0000000000000..44213f798895a
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js
@@ -0,0 +1,123 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /a/username/project/src
+For info: /a/username/project/src/index.ts :: Config file name: /a/username/project/tsconfig.json
+Creating configuration project /a/username/project/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/username/project/tsconfig.json 2000 undefined Project: /a/username/project/tsconfig.json WatchType: Config file
+Config: /a/username/project/tsconfig.json : {
+ "rootNames": [
+  "/a/username/project/src/file1.ts",
+  "/a/username/project/src/index.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/username/project/tsconfig.json"
+ },
+ "watchOptions": {
+  "synchronousWatchDirectory": true
+ }
+}
+FileWatcher:: Close:: WatchInfo: /a/username/project/tsconfig.json 2000 undefined Project: /a/username/project/tsconfig.json WatchType: Config file
+FileWatcher:: Added:: WatchInfo: /a/username/project/tsconfig.json 2000 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /a/username/project 1 {"synchronousWatchDirectory":true} Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/username/project 1 {"synchronousWatchDirectory":true} Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/username/project/src/file1.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/username/project/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/username/project/node_modules/@types 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/username/project/node_modules/@types 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/username/project/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/username/project/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/username/project/src/file1.ts
+	/a/username/project/src/index.ts
+
+
+	../../lib/lib.d.ts
+	  Default library for target 'es3'
+	src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	src/index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	  Imported via "./" from file 'src/index.ts'
+
+-----------------------------------------------
+Project '/a/username/project/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/username/project/src/index.ts ProjectRootPath: undefined
+		Projects: /a/username/project/tsconfig.json
+Completion Entries:: ["file1"]
+WatchedFiles::
+/a/username/project/tsconfig.json:
+  {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
+/a/username/project:
+  {"fileName":"/a/username/project","pollingInterval":500}
+/a/username/project/src:
+  {"fileName":"/a/username/project/src","pollingInterval":500}
+/a/username/project/src/file1.ts:
+  {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/node_modules/@types:
+  {"fileName":"/a/username/project/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+
+FsWatchesRecursive::
+
+DirectoryWatcher:: Triggered with /a/username/project/src :: WatchInfo: /a/username/project 1 {"synchronousWatchDirectory":true} Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+Scheduled: /a/username/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*
+Elapsed:: *ms DirectoryWatcher:: Triggered with /a/username/project/src :: WatchInfo: /a/username/project 1 {"synchronousWatchDirectory":true} Config: /a/username/project/tsconfig.json WatchType: Wild card directory
+DirectoryWatcher:: Triggered with /a/username/project/src :: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /a/username/project/tsconfig.jsonFailedLookupInvalidation
+Elapsed:: *ms DirectoryWatcher:: Triggered with /a/username/project/src :: WatchInfo: /a/username/project/src 1 {"synchronousWatchDirectory":true} Project: /a/username/project/tsconfig.json WatchType: Failed Lookup Locations
+Running: /a/username/project/tsconfig.json
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+FileWatcher:: Added:: WatchInfo: /a/username/project/src/file2.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/username/project/tsconfig.json
+Finishing updateGraphWorker: Project: /a/username/project/tsconfig.json Version: 2 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/username/project/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.d.ts
+	/a/username/project/src/file1.ts
+	/a/username/project/src/index.ts
+	/a/username/project/src/file2.ts
+
+
+	../../lib/lib.d.ts
+	  Default library for target 'es3'
+	src/file1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	src/index.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	  Imported via "./" from file 'src/index.ts'
+	src/file2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Completion Entries:: ["file1","file2"]
+WatchedFiles::
+/a/username/project/tsconfig.json:
+  {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
+/a/username/project:
+  {"fileName":"/a/username/project","pollingInterval":500}
+/a/username/project/src:
+  {"fileName":"/a/username/project/src","pollingInterval":500}
+/a/username/project/src/file1.ts:
+  {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/node_modules/@types:
+  {"fileName":"/a/username/project/node_modules/@types","pollingInterval":500}
+/a/username/project/src/file2.ts:
+  {"fileName":"/a/username/project/src/file2.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js b/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js
new file mode 100644
index 0000000000000..33a2374bba5ab
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js
@@ -0,0 +1,224 @@
+For files of style c:/myprojects/project/x.js
+Provided types map file "/typesMap.json" doesn't exist
+Search path: c:/myprojects/project
+For info: c:/myprojects/project/x.js :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: c:/myprojects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: c:/myprojects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: c:/a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: c:/myprojects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/myprojects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	c:/a/lib/lib.d.ts
+	c:/myprojects/project/x.js
+
+
+	../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	x.js
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: c:/myprojects/project/x.js ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+WatchedFiles::
+c:/myprojects/project/tsconfig.json:
+  {"fileName":"c:/myprojects/project/tsconfig.json","pollingInterval":250}
+c:/myprojects/project/jsconfig.json:
+  {"fileName":"c:/myprojects/project/jsconfig.json","pollingInterval":250}
+c:/a/lib/lib.d.ts:
+  {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+c:/myprojects/project/node_modules/@types:
+  {"directoryName":"c:/myprojects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+For files of style //vda1cs4850/myprojects/project/x.js
+Provided types map file "/typesMap.json" doesn't exist
+Search path: //vda1cs4850/myprojects/project
+For info: //vda1cs4850/myprojects/project/x.js :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: //vda1cs4850/myprojects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: //vda1cs4850/myprojects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: //vda1cs4850/a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: //vda1cs4850/myprojects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: //vda1cs4850/myprojects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	//vda1cs4850/a/lib/lib.d.ts
+	//vda1cs4850/myprojects/project/x.js
+
+
+	../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	x.js
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: //vda1cs4850/myprojects/project/x.js ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+WatchedFiles::
+//vda1cs4850/myprojects/project/tsconfig.json:
+  {"fileName":"//vda1cs4850/myprojects/project/tsconfig.json","pollingInterval":250}
+//vda1cs4850/myprojects/project/jsconfig.json:
+  {"fileName":"//vda1cs4850/myprojects/project/jsconfig.json","pollingInterval":250}
+//vda1cs4850/a/lib/lib.d.ts:
+  {"fileName":"//vda1cs4850/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+//vda1cs4850/myprojects/project/node_modules/@types:
+  {"directoryName":"//vda1cs4850/myprojects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+For files of style //vda1cs4850/c$/myprojects/project/x.js
+Provided types map file "/typesMap.json" doesn't exist
+Search path: //vda1cs4850/c$/myprojects/project
+For info: //vda1cs4850/c$/myprojects/project/x.js :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: //vda1cs4850/c$/myprojects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: //vda1cs4850/c$/myprojects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: //vda1cs4850/a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: //vda1cs4850/c$/myprojects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: //vda1cs4850/c$/myprojects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	//vda1cs4850/a/lib/lib.d.ts
+	//vda1cs4850/c$/myprojects/project/x.js
+
+
+	../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	x.js
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: //vda1cs4850/c$/myprojects/project/x.js ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+WatchedFiles::
+//vda1cs4850/c$/myprojects/project/tsconfig.json:
+  {"fileName":"//vda1cs4850/c$/myprojects/project/tsconfig.json","pollingInterval":250}
+//vda1cs4850/c$/myprojects/project/jsconfig.json:
+  {"fileName":"//vda1cs4850/c$/myprojects/project/jsconfig.json","pollingInterval":250}
+//vda1cs4850/a/lib/lib.d.ts:
+  {"fileName":"//vda1cs4850/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+//vda1cs4850/c$/myprojects/project/node_modules/@types:
+  {"directoryName":"//vda1cs4850/c$/myprojects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+For files of style c:/users/username/myprojects/project/x.js
+Provided types map file "/typesMap.json" doesn't exist
+Search path: c:/users/username/myprojects/project
+For info: c:/users/username/myprojects/project/x.js :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: c:/users/username/myprojects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: c:/users/username/myprojects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: c:/a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: c:/users/username/myprojects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: c:/users/username/myprojects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	c:/a/lib/lib.d.ts
+	c:/users/username/myprojects/project/x.js
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	x.js
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: c:/users/username/myprojects/project/x.js ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+WatchedFiles::
+c:/users/username/myprojects/project/tsconfig.json:
+  {"fileName":"c:/users/username/myprojects/project/tsconfig.json","pollingInterval":250}
+c:/users/username/myprojects/project/jsconfig.json:
+  {"fileName":"c:/users/username/myprojects/project/jsconfig.json","pollingInterval":250}
+c:/a/lib/lib.d.ts:
+  {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+c:/users/username/myprojects/project/node_modules/@types:
+  {"directoryName":"c:/users/username/myprojects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+For files of style //vda1cs4850/c$/users/username/myprojects/project/x.js
+Provided types map file "/typesMap.json" doesn't exist
+Search path: //vda1cs4850/c$/users/username/myprojects/project
+For info: //vda1cs4850/c$/users/username/myprojects/project/x.js :: No config files found.
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: //vda1cs4850/c$/users/username/myprojects/project/tsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+FileWatcher:: Added:: WatchInfo: //vda1cs4850/c$/users/username/myprojects/project/jsconfig.json 2000 undefined WatchType: Config file for the inferred project root
+Starting updateGraphWorker: Project: /dev/null/inferredProject1*
+FileWatcher:: Added:: WatchInfo: //vda1cs4850/a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: //vda1cs4850/c$/users/username/myprojects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: //vda1cs4850/c$/users/username/myprojects/project/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Finishing updateGraphWorker: Project: /dev/null/inferredProject1* Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+	//vda1cs4850/a/lib/lib.d.ts
+	//vda1cs4850/c$/users/username/myprojects/project/x.js
+
+
+	../../../../../a/lib/lib.d.ts
+	  Default library for target 'es5'
+	x.js
+	  Root file specified for compilation
+
+-----------------------------------------------
+Project '/dev/null/inferredProject1*' (Inferred)
+	Files (2)
+
+-----------------------------------------------
+Open files: 
+	FileName: //vda1cs4850/c$/users/username/myprojects/project/x.js ProjectRootPath: undefined
+		Projects: /dev/null/inferredProject1*
+WatchedFiles::
+//vda1cs4850/c$/users/username/myprojects/project/tsconfig.json:
+  {"fileName":"//vda1cs4850/c$/users/username/myprojects/project/tsconfig.json","pollingInterval":250}
+//vda1cs4850/c$/users/username/myprojects/project/jsconfig.json:
+  {"fileName":"//vda1cs4850/c$/users/username/myprojects/project/jsconfig.json","pollingInterval":250}
+//vda1cs4850/a/lib/lib.d.ts:
+  {"fileName":"//vda1cs4850/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+//vda1cs4850/c$/users/username/myprojects/project/node_modules/@types:
+  {"directoryName":"//vda1cs4850/c$/users/username/myprojects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configFile.js b/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configFile.js
new file mode 100644
index 0000000000000..27950d4a218b1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configFile.js
@@ -0,0 +1,71 @@
+Provided types map file "/typesMap.json" doesn't exist
+Search path: /user/username/projects/myproject/src
+For info: /user/username/projects/myproject/src/main.ts :: Config file name: /user/username/projects/myproject/tsconfig.json
+Creating configuration project /user/username/projects/myproject/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/src/main.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+ },
+ "watchOptions": {
+  "excludeDirectories": [
+   "/user/username/projects/myproject/node_modules"
+  ]
+ }
+}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/node_modules/bar/foo.d.ts
+	/user/username/projects/myproject/node_modules/bar/index.d.ts
+	/user/username/projects/myproject/src/main.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	node_modules/bar/foo.d.ts
+	  Imported via "./foo" from file 'node_modules/bar/index.d.ts'
+	node_modules/bar/index.d.ts
+	  Imported via "bar" from file 'src/main.ts'
+	src/main.ts
+	  Matched by include pattern 'src' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
+WatchedFiles::
+/user/username/projects/myproject/tsconfig.json:
+  {"fileName":"/user/username/projects/myproject/tsconfig.json","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+/user/username/projects/myproject/src:
+  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/user/username/projects/myproject/node_modules:
+  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configuration.js
new file mode 100644
index 0000000000000..e435ad87bd0dc
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configuration.js
@@ -0,0 +1,69 @@
+Provided types map file "/typesMap.json" doesn't exist
+Host watch options changed to {"excludeDirectories":["node_modules"]}, it will be take effect for next watches.
+Search path: /user/username/projects/myproject/src
+For info: /user/username/projects/myproject/src/main.ts :: Config file name: /user/username/projects/myproject/tsconfig.json
+Creating configuration project /user/username/projects/myproject/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 {"excludeDirectories":["node_modules"]} Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
+Config: /user/username/projects/myproject/tsconfig.json : {
+ "rootNames": [
+  "/user/username/projects/myproject/src/main.ts"
+ ],
+ "options": {
+  "configFilePath": "/user/username/projects/myproject/tsconfig.json"
+ },
+ "watchOptions": {
+  "excludeDirectories": [
+   "/user/username/projects/myproject/node_modules"
+  ]
+ }
+}
+FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 {"excludeDirectories":["node_modules"]} Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+Starting updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 {"excludeDirectories":["node_modules"]} WatchType: node_modules for closed script infos and package.jsons affecting module specifier cache
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 {"excludeDirectories":["node_modules"]} WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Project: /user/username/projects/myproject/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /user/username/projects/myproject/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (4)
+	/a/lib/lib.d.ts
+	/user/username/projects/myproject/node_modules/bar/foo.d.ts
+	/user/username/projects/myproject/node_modules/bar/index.d.ts
+	/user/username/projects/myproject/src/main.ts
+
+
+	../../../../a/lib/lib.d.ts
+	  Default library for target 'es3'
+	node_modules/bar/foo.d.ts
+	  Imported via "./foo" from file 'node_modules/bar/index.d.ts'
+	node_modules/bar/index.d.ts
+	  Imported via "bar" from file 'src/main.ts'
+	src/main.ts
+	  Matched by include pattern 'src' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/user/username/projects/myproject/tsconfig.json' (Configured)
+	Files (4)
+
+-----------------------------------------------
+Open files: 
+	FileName: /user/username/projects/myproject/src/main.ts ProjectRootPath: undefined
+		Projects: /user/username/projects/myproject/tsconfig.json
+WatchedFiles::
+/user/username/projects/myproject/tsconfig.json:
+  {"fileName":"/user/username/projects/myproject/tsconfig.json","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+
+FsWatchesRecursive::
+/user/username/projects/myproject/src:
+  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-as-host-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-as-host-configuration.js
new file mode 100644
index 0000000000000..a08d50814d555
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-as-host-configuration.js
@@ -0,0 +1,67 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"command":"configure","arguments":{"watchOptions":{"fallbackPolling":"PriorityInterval"}},"seq":1,"type":"request"}
+Host watch options changed to {"fallbackPolling":1}, it will be take effect for next watches.
+response:
+    {"seq":0,"type":"response","command":"configure","request_seq":1,"success":true}
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/a/b/commonFile1.ts","projectRootPath":"/a/b"}}
+Search path: /a/b
+For info: /a/b/commonFile1.ts :: Config file name: /a/b/tsconfig.json
+Creating configuration project /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 {"fallbackPolling":1} Project: /a/b/tsconfig.json WatchType: Config file
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/commonFile1.ts",
+  "/a/b/commonFile2.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b 1 {"fallbackPolling":1} Config: /a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 1 {"fallbackPolling":1} Config: /a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/commonFile2.ts 500 {"fallbackPolling":1} WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 {"fallbackPolling":1} WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 {"fallbackPolling":1} Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 {"fallbackPolling":1} Project: /a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/b/commonFile1.ts
+	/a/b/commonFile2.ts
+
+
+	../lib/lib.d.ts
+	  Default library for target 'es3'
+	commonFile1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	commonFile2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/commonFile1.ts ProjectRootPath: /a/b
+		Projects: /a/b/tsconfig.json
+response:{"responseRequired":false}
+WatchedFiles::
+/a/b/tsconfig.json:
+  {"fileName":"/a/b/tsconfig.json","pollingInterval":250}
+/a/b:
+  {"fileName":"/a/b","pollingInterval":500}
+/a/b/commonfile2.ts:
+  {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+
+FsWatchesRecursive::
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-in-configFile.js b/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-in-configFile.js
new file mode 100644
index 0000000000000..e5fe517b12deb
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-fallbackPolling-option-in-configFile.js
@@ -0,0 +1,70 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"command":"configure","arguments":{"watchOptions":{"fallbackPolling":"PriorityInterval"}},"seq":1,"type":"request"}
+Host watch options changed to {"fallbackPolling":1}, it will be take effect for next watches.
+response:
+    {"seq":0,"type":"response","command":"configure","request_seq":1,"success":true}
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/a/b/commonFile1.ts","projectRootPath":"/a/b"}}
+Search path: /a/b
+For info: /a/b/commonFile1.ts :: Config file name: /a/b/tsconfig.json
+Creating configuration project /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 {"fallbackPolling":1} Project: /a/b/tsconfig.json WatchType: Config file
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/commonFile1.ts",
+  "/a/b/commonFile2.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/tsconfig.json"
+ },
+ "watchOptions": {
+  "fallbackPolling": 1
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b 1 {"fallbackPolling":1} Config: /a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 1 {"fallbackPolling":1} Config: /a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/commonFile2.ts 500 {"fallbackPolling":1} WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 {"fallbackPolling":1} WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 {"fallbackPolling":1} Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 {"fallbackPolling":1} Project: /a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/b/commonFile1.ts
+	/a/b/commonFile2.ts
+
+
+	../lib/lib.d.ts
+	  Default library for target 'es3'
+	commonFile1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	commonFile2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/commonFile1.ts ProjectRootPath: /a/b
+		Projects: /a/b/tsconfig.json
+response:{"responseRequired":false}
+WatchedFiles::
+/a/b/tsconfig.json:
+  {"fileName":"/a/b/tsconfig.json","pollingInterval":250}
+/a/b:
+  {"fileName":"/a/b","pollingInterval":500}
+/a/b/commonfile2.ts:
+  {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+
+FsWatchesRecursive::
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-as-host-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-as-host-configuration.js
new file mode 100644
index 0000000000000..90cdf93cc6c3f
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-as-host-configuration.js
@@ -0,0 +1,67 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"command":"configure","arguments":{"watchOptions":{"watchDirectory":"UseFsEvents"}},"seq":1,"type":"request"}
+Host watch options changed to {"watchDirectory":0}, it will be take effect for next watches.
+response:
+    {"seq":0,"type":"response","command":"configure","request_seq":1,"success":true}
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/a/b/commonFile1.ts","projectRootPath":"/a/b"}}
+Search path: /a/b
+For info: /a/b/commonFile1.ts :: Config file name: /a/b/tsconfig.json
+Creating configuration project /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 {"watchDirectory":0} Project: /a/b/tsconfig.json WatchType: Config file
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/commonFile1.ts",
+  "/a/b/commonFile2.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b 1 {"watchDirectory":0} Config: /a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 1 {"watchDirectory":0} Config: /a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/commonFile2.ts 500 {"watchDirectory":0} WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 {"watchDirectory":0} WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 {"watchDirectory":0} Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 {"watchDirectory":0} Project: /a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/b/commonFile1.ts
+	/a/b/commonFile2.ts
+
+
+	../lib/lib.d.ts
+	  Default library for target 'es3'
+	commonFile1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	commonFile2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/commonFile1.ts ProjectRootPath: /a/b
+		Projects: /a/b/tsconfig.json
+response:{"responseRequired":false}
+WatchedFiles::
+/a/b/tsconfig.json:
+  {"fileName":"/a/b/tsconfig.json","pollingInterval":250}
+/a/b/commonfile2.ts:
+  {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+/a/b:
+  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/b/node_modules/@types:
+  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+FsWatchesRecursive::
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-in-configFile.js b/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-in-configFile.js
new file mode 100644
index 0000000000000..466c000fc243b
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-in-configFile.js
@@ -0,0 +1,67 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/a/b/commonFile1.ts","projectRootPath":"/a/b"}}
+Search path: /a/b
+For info: /a/b/commonFile1.ts :: Config file name: /a/b/tsconfig.json
+Creating configuration project /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/commonFile1.ts",
+  "/a/b/commonFile2.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/tsconfig.json"
+ },
+ "watchOptions": {
+  "watchDirectory": 0
+ }
+}
+FileWatcher:: Close:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 {"watchDirectory":0} Project: /a/b/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /a/b 1 {"watchDirectory":0} Config: /a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 1 {"watchDirectory":0} Config: /a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/commonFile2.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 {"watchDirectory":0} Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 {"watchDirectory":0} Project: /a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/b/commonFile1.ts
+	/a/b/commonFile2.ts
+
+
+	../lib/lib.d.ts
+	  Default library for target 'es3'
+	commonFile1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	commonFile2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/commonFile1.ts ProjectRootPath: /a/b
+		Projects: /a/b/tsconfig.json
+response:{"responseRequired":false}
+WatchedFiles::
+/a/b/tsconfig.json:
+  {"fileName":"/a/b/tsconfig.json","pollingInterval":250}
+/a/b/commonfile2.ts:
+  {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+/a/b:
+  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/b/node_modules/@types:
+  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+FsWatchesRecursive::
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-as-host-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-as-host-configuration.js
new file mode 100644
index 0000000000000..0ce74334fc9de
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-as-host-configuration.js
@@ -0,0 +1,67 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"command":"configure","arguments":{"watchOptions":{"watchFile":"UseFsEvents"}},"seq":1,"type":"request"}
+Host watch options changed to {"watchFile":4}, it will be take effect for next watches.
+response:
+    {"seq":0,"type":"response","command":"configure","request_seq":1,"success":true}
+response:{"responseRequired":false}
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/a/b/commonFile1.ts","projectRootPath":"/a/b"}}
+Search path: /a/b
+For info: /a/b/commonFile1.ts :: Config file name: /a/b/tsconfig.json
+Creating configuration project /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 {"watchFile":4} Project: /a/b/tsconfig.json WatchType: Config file
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/commonFile1.ts",
+  "/a/b/commonFile2.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/tsconfig.json"
+ }
+}
+DirectoryWatcher:: Added:: WatchInfo: /a/b 1 {"watchFile":4} Config: /a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 1 {"watchFile":4} Config: /a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/commonFile2.ts 500 {"watchFile":4} WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 {"watchFile":4} WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 {"watchFile":4} Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 {"watchFile":4} Project: /a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/b/commonFile1.ts
+	/a/b/commonFile2.ts
+
+
+	../lib/lib.d.ts
+	  Default library for target 'es3'
+	commonFile1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	commonFile2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/commonFile1.ts ProjectRootPath: /a/b
+		Projects: /a/b/tsconfig.json
+response:{"responseRequired":false}
+WatchedFiles::
+
+FsWatches::
+/a/b/tsconfig.json:
+  {"directoryName":"/a/b/tsconfig.json","fallbackPollingInterval":2000,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/b/commonfile2.ts:
+  {"directoryName":"/a/b/commonFile2.ts","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/lib/lib.d.ts:
+  {"directoryName":"/a/lib/lib.d.ts","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+FsWatchesRecursive::
+/a/b:
+  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/b/node_modules/@types:
+  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-in-configFile.js b/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-in-configFile.js
new file mode 100644
index 0000000000000..b7aecd0a11db1
--- /dev/null
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-in-configFile.js
@@ -0,0 +1,67 @@
+Provided types map file "/a/lib/typesMap.json" doesn't exist
+request:{"seq":0,"type":"request","command":"open","arguments":{"file":"/a/b/commonFile1.ts","projectRootPath":"/a/b"}}
+Search path: /a/b
+For info: /a/b/commonFile1.ts :: Config file name: /a/b/tsconfig.json
+Creating configuration project /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+Config: /a/b/tsconfig.json : {
+ "rootNames": [
+  "/a/b/commonFile1.ts",
+  "/a/b/commonFile2.ts"
+ ],
+ "options": {
+  "configFilePath": "/a/b/tsconfig.json"
+ },
+ "watchOptions": {
+  "watchFile": 4
+ }
+}
+FileWatcher:: Close:: WatchInfo: /a/b/tsconfig.json 2000 undefined Project: /a/b/tsconfig.json WatchType: Config file
+FileWatcher:: Added:: WatchInfo: /a/b/tsconfig.json 2000 {"watchFile":4} Project: /a/b/tsconfig.json WatchType: Config file
+DirectoryWatcher:: Added:: WatchInfo: /a/b 1 {"watchFile":4} Config: /a/b/tsconfig.json WatchType: Wild card directory
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b 1 {"watchFile":4} Config: /a/b/tsconfig.json WatchType: Wild card directory
+Plugins were requested but not running in environment that supports 'require'. Nothing will be loaded
+FileWatcher:: Added:: WatchInfo: /a/b/commonFile2.ts 500 undefined WatchType: Closed Script info
+Starting updateGraphWorker: Project: /a/b/tsconfig.json
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined WatchType: Closed Script info
+DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 {"watchFile":4} Project: /a/b/tsconfig.json WatchType: Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a/b/node_modules/@types 1 {"watchFile":4} Project: /a/b/tsconfig.json WatchType: Type roots
+Finishing updateGraphWorker: Project: /a/b/tsconfig.json Version: 1 structureChanged: true structureIsReused:: Not Elapsed:: *ms
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+	/a/lib/lib.d.ts
+	/a/b/commonFile1.ts
+	/a/b/commonFile2.ts
+
+
+	../lib/lib.d.ts
+	  Default library for target 'es3'
+	commonFile1.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+	commonFile2.ts
+	  Matched by include pattern '**/*' in 'tsconfig.json'
+
+-----------------------------------------------
+Project '/a/b/tsconfig.json' (Configured)
+	Files (3)
+
+-----------------------------------------------
+Open files: 
+	FileName: /a/b/commonFile1.ts ProjectRootPath: /a/b
+		Projects: /a/b/tsconfig.json
+response:{"responseRequired":false}
+WatchedFiles::
+/a/b/commonfile2.ts:
+  {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
+/a/lib/lib.d.ts:
+  {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+
+FsWatches::
+/a/b/tsconfig.json:
+  {"directoryName":"/a/b/tsconfig.json","fallbackPollingInterval":2000,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+
+FsWatchesRecursive::
+/a/b:
+  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+/a/b/node_modules/@types:
+  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}

From 03fa5b3a9803e33e3a37807964a9bcd91e56d9ed Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Thu, 5 May 2022 11:34:50 -0700
Subject: [PATCH 02/15] Add tests for inode watching by making fsWatch part of
 system function that tests presence before creating fs watch

---
 src/compiler/sys.ts                           | 307 +++++++++---------
 src/harness/virtualFileSystemWithWatch.ts     | 153 +++++----
 .../unittests/tscWatch/watchEnvironment.ts    |  36 ++
 .../demo/updates-with-bad-reference.js        |  12 +-
 .../demo/updates-with-circular-reference.js   |  12 +-
 ...for-changes-to-package-json-main-fields.js |  12 +-
 ...t-correctly-with-cts-and-mts-extensions.js |  20 +-
 ...n-no-files-are-emitted-with-incremental.js |   6 +-
 ...when-watching-when-no-files-are-emitted.js |   6 +-
 ...mit-any-files-on-error-with-incremental.js |  14 +-
 .../does-not-emit-any-files-on-error.js       |  14 +-
 .../creates-solution-in-watch-mode.js         |   4 +-
 .../incremental-updates-in-verbose-mode.js    |  12 +-
 .../when-file-with-no-error-changes.js        |   6 +-
 ...ing-errors-only-changed-file-is-emitted.js |   6 +-
 .../when-file-with-no-error-changes.js        |   4 +-
 ...ixing-error-files-all-files-are-emitted.js |   4 +-
 .../when-preserveWatchOutput-is-not-used.js   |  12 +-
 ...veWatchOutput-is-passed-on-command-line.js |  12 +-
 ...e-of-program-emit-with-outDir-specified.js |   8 +-
 ...r-recompilation-because-of-program-emit.js |   8 +-
 ...-references-watches-only-those-projects.js |   4 +-
 ...tches-config-files-that-are-not-present.js |  10 +-
 ...e-down-stream-project-and-then-fixes-it.js |  12 +-
 ...ncing-project-even-for-non-local-change.js |  20 +-
 ...le-is-added,-and-its-subsequent-updates.js |  28 +-
 ...hanges-and-reports-found-errors-message.js |  40 +--
 ...not-start-build-of-referencing-projects.js |  16 +-
 ...le-is-added,-and-its-subsequent-updates.js |  28 +-
 ...hanges-and-reports-found-errors-message.js |  40 +--
 ...not-start-build-of-referencing-projects.js |  16 +-
 ...hen-noUnusedParameters-changes-to-false.js |   4 +-
 .../works-with-extended-source-files.js       |   6 +-
 .../publicApi/with-custom-transformers.js     |   8 +-
 .../reexport/Reports-errors-correctly.js      |  12 +-
 ...e-projects-with-single-watcher-per-file.js |  28 +-
 .../same-file-in-multiple-projects.js         |  28 +-
 .../createWatchOfConfigFile.js                |   4 +-
 ...Result-on-WatchCompilerHostOfConfigFile.js |   4 +-
 ...s-deleted-and-created-as-part-of-change.js |  12 +-
 .../should-emit-specified-file.js             |  18 +-
 ...elf-if-'--isolatedModules'-is-specified.js |  12 +-
 ...-if-'--out'-or-'--outFile'-is-specified.js |  12 +-
 ...should-be-up-to-date-with-deleted-files.js |  12 +-
 ...-be-up-to-date-with-newly-created-files.js |  12 +-
 ...-to-date-with-the-reference-map-changes.js |  36 +-
 ...les-referencing-it-if-its-shape-changed.js |  18 +-
 ...should-detect-changes-in-non-root-files.js |  12 +-
 .../should-detect-non-existing-code-file.js   |  18 +-
 .../should-detect-removed-code-file.js        |  12 +-
 ...ll-files-if-a-global-file-changed-shape.js |  12 +-
 ...ould-return-cascaded-affected-file-list.js |  24 +-
 ...fine-for-files-with-circular-references.js |  12 +-
 .../config-does-not-have-out-or-outFile.js    |  18 +-
 .../config-has-out.js                         |  18 +-
 .../config-has-outFile.js                     |  18 +-
 ...ltiple-declaration-files-in-the-program.js |   4 +-
 ...ltiple-declaration-files-in-the-program.js |   4 +-
 ...-recursive-directory-watcher-is-invoked.js |  12 +-
 .../errors-for-.d.ts-change.js                |  32 +-
 .../errors-for-.ts-change.js                  |  24 +-
 ...g-a-deep-multilevel-import-that-changes.js |  24 +-
 .../no-circular-import/export.js              |  16 +-
 .../yes-circular-import/exports.js            |  16 +-
 .../with-noEmitOnError-with-incremental.js    |  42 +--
 .../with-noEmitOnError.js                     |  42 +--
 .../errors-for-.d.ts-change.js                |  32 +-
 .../errors-for-.ts-change.js                  |  24 +-
 ...g-a-deep-multilevel-import-that-changes.js |  24 +-
 .../no-circular-import/export.js              |  16 +-
 .../yes-circular-import/exports.js            |  16 +-
 .../with-noEmitOnError-with-incremental.js    |  42 +--
 .../with-noEmitOnError.js                     |  42 +--
 .../errors-for-.d.ts-change.js                |  32 +-
 .../errors-for-.ts-change.js                  |  24 +-
 ...g-a-deep-multilevel-import-that-changes.js |  24 +-
 .../no-circular-import/export.js              |  16 +-
 .../yes-circular-import/exports.js            |  16 +-
 .../with-noEmitOnError-with-incremental.js    |  42 +--
 .../default/with-noEmitOnError.js             |  42 +--
 .../errors-for-.d.ts-change.js                |  32 +-
 .../errors-for-.ts-change.js                  |  24 +-
 ...g-a-deep-multilevel-import-that-changes.js |  24 +-
 .../no-circular-import/export.js              |  16 +-
 .../yes-circular-import/exports.js            |  16 +-
 .../with-noEmitOnError-with-incremental.js    |  42 +--
 .../defaultAndD/with-noEmitOnError.js         |  42 +--
 .../errors-for-.d.ts-change.js                |  32 +-
 .../errors-for-.ts-change.js                  |  24 +-
 ...g-a-deep-multilevel-import-that-changes.js |  24 +-
 .../no-circular-import/export.js              |  16 +-
 .../yes-circular-import/exports.js            |  16 +-
 .../with-noEmitOnError-with-incremental.js    |  42 +--
 .../with-noEmitOnError.js                     |  42 +--
 .../errors-for-.d.ts-change.js                |  32 +-
 .../errors-for-.ts-change.js                  |  24 +-
 ...g-a-deep-multilevel-import-that-changes.js |  24 +-
 .../no-circular-import/export.js              |  16 +-
 .../yes-circular-import/exports.js            |  16 +-
 .../with-noEmitOnError-with-incremental.js    |  42 +--
 .../with-noEmitOnError.js                     |  42 +--
 .../errors-for-.d.ts-change.js                |  32 +-
 .../errors-for-.ts-change.js                  |  24 +-
 ...g-a-deep-multilevel-import-that-changes.js |  24 +-
 .../no-circular-import/export.js              |  16 +-
 .../yes-circular-import/exports.js            |  16 +-
 .../with-noEmitOnError-with-incremental.js    |  42 +--
 .../incremental/default/with-noEmitOnError.js |  42 +--
 .../errors-for-.d.ts-change.js                |  32 +-
 .../errors-for-.ts-change.js                  |  24 +-
 ...g-a-deep-multilevel-import-that-changes.js |  24 +-
 .../no-circular-import/export.js              |  16 +-
 .../yes-circular-import/exports.js            |  16 +-
 .../with-noEmitOnError-with-incremental.js    |  42 +--
 .../defaultAndD/with-noEmitOnError.js         |  42 +--
 .../errors-for-.d.ts-change.js                |  32 +-
 .../errors-for-.ts-change.js                  |  24 +-
 ...g-a-deep-multilevel-import-that-changes.js |  24 +-
 .../no-circular-import/export.js              |  16 +-
 .../yes-circular-import/exports.js            |  16 +-
 .../with-noEmitOnError-with-incremental.js    |  42 +--
 .../isolatedModules/with-noEmitOnError.js     |  42 +--
 .../errors-for-.d.ts-change.js                |  32 +-
 .../errors-for-.ts-change.js                  |  24 +-
 ...g-a-deep-multilevel-import-that-changes.js |  24 +-
 .../no-circular-import/export.js              |  16 +-
 .../yes-circular-import/exports.js            |  16 +-
 .../with-noEmitOnError-with-incremental.js    |  42 +--
 .../isolatedModulesAndD/with-noEmitOnError.js |  42 +--
 .../errors-for-.d.ts-change.js                |  32 +-
 .../errors-for-.ts-change.js                  |  24 +-
 ...g-a-deep-multilevel-import-that-changes.js |  24 +-
 .../no-circular-import/export.js              |  16 +-
 .../yes-circular-import/exports.js            |  16 +-
 .../with-noEmitOnError-with-incremental.js    |  42 +--
 .../isolatedModules/with-noEmitOnError.js     |  42 +--
 .../errors-for-.d.ts-change.js                |  32 +-
 .../errors-for-.ts-change.js                  |  24 +-
 ...g-a-deep-multilevel-import-that-changes.js |  24 +-
 .../no-circular-import/export.js              |  16 +-
 .../yes-circular-import/exports.js            |  16 +-
 .../with-noEmitOnError-with-incremental.js    |  42 +--
 .../isolatedModulesAndD/with-noEmitOnError.js |  42 +--
 .../jsxImportSource-option-changed.js         |   6 +-
 ...n-Windows-style-drive-root-is-lowercase.js |  12 +-
 ...n-Windows-style-drive-root-is-uppercase.js |  12 +-
 ...ry-symlink-target-and-import-match-disk.js |  12 +-
 ...le-symlink-target-and-import-match-disk.js |  12 +-
 ...nging-module-name-with-different-casing.js |  12 +-
 ...target-matches-disk-but-import-does-not.js |  12 +-
 ...target-matches-disk-but-import-does-not.js |  12 +-
 ...link-target,-and-disk-are-all-different.js |  20 +-
 ...link-target,-and-disk-are-all-different.js |  24 +-
 ...link-target-agree-but-do-not-match-disk.js |  12 +-
 ...link-target-agree-but-do-not-match-disk.js |  12 +-
 ...k-but-directory-symlink-target-does-not.js |  12 +-
 ...s-disk-but-file-symlink-target-does-not.js |  12 +-
 ...ative-information-file-location-changes.js |  12 +-
 ...hen-renaming-file-with-different-casing.js |  12 +-
 .../editing-module-augmentation-watch.js      |  20 +-
 ...portHelpers-backing-types-removed-watch.js |  16 +-
 ...remental-with-circular-references-watch.js |  12 +-
 ...xImportSource-backing-types-added-watch.js |  18 +-
 ...mportSource-backing-types-removed-watch.js |  16 +-
 .../jsxImportSource-option-changed-watch.js   |  16 +-
 .../own-file-emit-with-errors-watch.js        |  12 +-
 .../own-file-emit-without-errors-watch.js     |  12 +-
 .../module-compilation/with---out-watch.js    |   6 +-
 .../own-file-emit-with-errors-watch.js        |  12 +-
 ...-parameters-that-are-not-relative-watch.js |  12 +-
 .../without-commandline-options-watch.js      |  12 +-
 ...lobal-declaration-file-is-deleted-watch.js |  12 +-
 .../tscWatch/incremental/with---out-watch.js  |   6 +-
 ...for-changes-to-package-json-main-fields.js |  76 ++---
 .../esm-mode-file-is-edited.js                |  12 +-
 ...nerated-when-the-config-file-has-errors.js |   6 +-
 ...configFile-contents-when-options-change.js |  12 +-
 ...rs-document-is-not-contained-in-project.js |   6 +-
 ...rts-errors-when-the-config-file-changes.js |  18 +-
 ...nostics-when-'--noUnusedLabels'-changes.js |   6 +-
 ...-a-configured-program-without-file-list.js |  12 +-
 ...hould-remove-the-module-not-found-error.js |   2 +-
 ...has-changed-(new-file-in-list-of-files).js |   8 +-
 ...ot-files-has-changed-(new-file-on-disk).js |  12 +-
 ...-root-files-has-changed-through-include.js |  20 +-
 ...config-file-name-with-difference-casing.js |   4 +-
 ...-when-set-of-root-files-was-not-changed.js |   8 +-
 .../programUpdates/change-module-to-none.js   |  12 +-
 .../config-file-includes-the-file.js          |   4 +-
 .../programUpdates/config-file-is-deleted.js  |  12 +-
 ...s-changes-in-lib-section-of-config-file.js |  12 +-
 ...te-configured-project-without-file-list.js |   6 +-
 .../create-watch-without-config-file.js       |   2 +-
 ...eleted-files-affect-project-structure-2.js |   2 +-
 .../deleted-files-affect-project-structure.js |   2 +-
 .../extended-source-files-are-watched.js      |  20 +-
 .../file-in-files-is-deleted.js               |   8 +-
 ...iles-explicitly-excluded-in-config-file.js |   6 +-
 .../handle-recreated-files-correctly.js       |  24 +-
 ...esnt-have-errors,-they-are-not-reported.js |   6 +-
 ...ndle-@types-if-input-file-list-is-empty.js |   2 +-
 ...e-tolerated-without-crashing-the-server.js |  16 +-
 ...tore-the-states-for-configured-projects.js |  24 +-
 ...estore-the-states-for-inferred-projects.js |   2 +-
 ...rors-correctly-with-file-not-in-rootDir.js |  12 +-
 ...s-errors-correctly-with-isolatedModules.js |  12 +-
 ...non-existing-directories-in-config-file.js |  10 +-
 ...ting-files-specified-in-the-config-file.js |   4 +-
 .../declarationDir-is-specified.js            |  32 +-
 ...-outDir-and-declarationDir-is-specified.js |  32 +-
 .../when-outDir-is-specified.js               |  32 +-
 .../with-outFile.js                           |  32 +-
 ...e-is-specified-with-declaration-enabled.js |  32 +-
 .../without-outDir-or-outFile-is-specified.js |  32 +-
 ...odule-resolution-changes-in-config-file.js |  12 +-
 .../should-reflect-change-in-config-file.js   |  12 +-
 ...errors-and-still-try-to-build-a-project.js |   6 +-
 ...-from-config-file-path-if-config-exists.js |   4 +-
 ...tes-diagnostics-and-emit-for-decorators.js |   6 +-
 ...it-when-useDefineForClassFields-changes.js |   4 +-
 .../updates-emit-on-jsx-option-change.js      |  12 +-
 ...mit-when-importsNotUsedAsValues-changes.js |  24 +-
 ...on-emit-is-disabled-in-compiler-options.js |  30 +-
 .../with-default-options.js                   |  12 +-
 .../with-skipDefaultLibCheck.js               |  12 +-
 .../with-skipLibCheck.js                      |  12 +-
 .../with-default-options.js                   |  12 +-
 .../with-skipDefaultLibCheck.js               |  12 +-
 .../with-skipLibCheck.js                      |  12 +-
 ...when-ambient-modules-of-program-changes.js |  18 +-
 ...orceConsistentCasingInFileNames-changes.js |   4 +-
 ...s-errors-when-noErrorTruncation-changes.js |  12 +-
 ...es-errors-when-strictNullChecks-changes.js |  24 +-
 ...solution-when-resolveJsonModule-changes.js |  23 +-
 ...and-new-file-is-added-as-part-of-change.js |  12 +-
 .../when-creating-extensionless-file.js       |  12 +-
 ...n-creating-new-file-in-symlinked-folder.js |  16 +-
 ...file-is-added-to-the-referenced-project.js |  96 +++---
 ...ibCheck-and-skipDefaultLibCheck-changes.js |  42 +--
 ...-file-is-changed-but-its-content-havent.js |   8 +-
 .../on-sample-project.js                      |  48 +--
 ...-different-folders-with-no-files-clause.js | 210 ++++++------
 ...nsitive-references-in-different-folders.js | 156 ++++-----
 .../on-transitive-references.js               |  62 ++--
 ...roject-uses-different-module-resolution.js |   6 +-
 .../tscWatch/resolutionCache/caching-works.js |  14 +-
 .../watch-with-configFile.js                  |  16 +-
 .../watch-without-configFile.js               |   4 +-
 .../loads-missing-files-from-disk.js          |  10 +-
 ...module-goes-missing-and-then-comes-back.js |  12 +-
 ...are-global-and-installed-at-later-point.js |  19 +-
 .../with-modules-linked-to-sibling-folder.js  |  16 +-
 ...cluded-file-with-ambient-module-changes.js |  16 +-
 ...-no-notification-from-fs-for-index-file.js |  30 +-
 ...le-resolution-changes-to-ambient-module.js |  11 +-
 ...der-that-already-contains-@types-folder.js |  13 +-
 ...rogram-with-files-from-external-library.js |  32 +-
 ...es-field-when-solution-is-already-built.js |  28 +-
 ...Symlinks-when-solution-is-already-built.js |  28 +-
 ...n-has-types-field-with-preserveSymlinks.js |  28 +-
 ...-package-when-solution-is-already-built.js |  28 +-
 ...Symlinks-when-solution-is-already-built.js |  28 +-
 ...th-scoped-package-with-preserveSymlinks.js |  28 +-
 ...son-has-types-field-with-scoped-package.js |  28 +-
 .../when-packageJson-has-types-field.js       |  28 +-
 ...ubFolder-when-solution-is-already-built.js |  28 +-
 ...Symlinks-when-solution-is-already-built.js |  28 +-
 ...le-from-subFolder-with-preserveSymlinks.js |  28 +-
 ...-package-when-solution-is-already-built.js |  28 +-
 ...Symlinks-when-solution-is-already-built.js |  28 +-
 ...th-scoped-package-with-preserveSymlinks.js |  28 +-
 ...file-from-subFolder-with-scoped-package.js |  28 +-
 .../when-referencing-file-from-subFolder.js   |  28 +-
 ...-project-when-solution-is-already-built.js |  14 +-
 .../with-simple-project.js                    |  14 +-
 .../extraFileExtensions-are-supported.js      |  12 +-
 ...noEmit-with-composite-with-emit-builder.js |  30 +-
 ...it-with-composite-with-semantic-builder.js |  30 +-
 ...nError-with-composite-with-emit-builder.js |  18 +-
 ...or-with-composite-with-semantic-builder.js |  18 +-
 .../watchApi/semantic-builder-emitOnlyDts.js  |  12 +-
 ...createSemanticDiagnosticsBuilderProgram.js |  12 +-
 ...n-works-when-returned-without-extension.js |   4 +-
 ...assed-down-to-the-watch-status-reporter.js |   4 +-
 ...ing-useSourceOfProjectReferenceRedirect.js |  96 +++---
 ...-host-implementing-getParsedCommandLine.js |  64 ++--
 ...-timesouts-on-host-program-gets-updated.js |  12 +-
 ...when-using-file-watching-thats-on-inode.js | 244 ++++++++++++++
 ...rectory-when-renaming-file-in-subfolder.js |  16 +-
 ...ymlinks-to-folders-in-recursive-folders.js |  18 +-
 ...hronous-watch-directory-renaming-a-file.js |  40 +--
 ...ory-with-outDir-and-declaration-enabled.js |  84 ++---
 .../with-non-synchronous-watch-directory.js   | 110 +++----
 ...lt-as-fixed-chunk-size-watch-file-works.js |  18 +-
 .../using-fixed-chunk-size-polling.js         |  30 +-
 ...eDirectories-option-extendedDiagnostics.js |   8 +-
 ...-directory-watching-extendedDiagnostics.js |  36 +-
 ...ption-with-recursive-directory-watching.js |  36 +-
 .../with-excludeDirectories-option.js         |   8 +-
 ...excludeFiles-option-extendedDiagnostics.js |  20 +-
 .../watchOptions/with-excludeFiles-option.js  |  20 +-
 .../with-fallbackPolling-option.js            |   2 +-
 .../with-watchDirectory-option.js             |   6 +-
 ...th-watchFile-as-watch-options-to-extend.js |  14 +-
 .../watchOptions/with-watchFile-option.js     |  14 +-
 .../loads-missing-files-from-disk.js          |   2 +-
 ...onfig-timeout-occurs-after-installation.js |   8 +
 ...g-timeouts-occur-inbetween-installation.js |   8 +
 .../works-using-legacy-resolution-logic.js    |   4 +-
 ...-when-timeout-occurs-after-installation.js |   3 +
 ...n-timeout-occurs-inbetween-installation.js |   3 +
 ...ession-and-project-is-not-at-root-level.js |   3 +
 ...Update-and-project-is-not-at-root-level.js |   3 +
 ...Update-and-project-is-not-at-root-level.js |   3 +
 .../npm-install-@types-works.js               |   8 +
 ...tion-when-project-compiles-from-sources.js |   3 +
 ...ping-when-project-compiles-from-sources.js |   3 +
 ...ect-watch-options-in-host-configuration.js |   2 +-
 .../external-project-watch-options.js         |   4 +-
 .../watchEnvironment/files-at-root.js         |   6 +-
 .../files-at-windows-style-root.js            |   6 +-
 .../watchEnvironment/files-not-at-root.js     |  10 +-
 .../files-not-at-windows-style-root.js        |  10 +-
 ...ect-watch-options-in-host-configuration.js |   2 +-
 .../inferred-project-watch-options.js         |   4 +-
 .../project-with-ascii-file-names-with-i.js   |   8 +-
 .../project-with-ascii-file-names.js          |   8 +-
 .../project-with-unicode-file-names.js        |   8 +-
 ...files-starting-with-dot-in-node_modules.js |  70 ++--
 ...rectory-when-file-is-added-to-subfolder.js |  16 +-
 ...watching-files-with-network-style-paths.js |  20 +-
 ...excludeDirectories-option-in-configFile.js |   6 +-
 ...ludeDirectories-option-in-configuration.js |   4 +-
 ...hDirectory-option-as-host-configuration.js |   6 +-
 ...ith-watchDirectory-option-in-configFile.js |   6 +-
 ...-watchFile-option-as-host-configuration.js |  12 +-
 .../with-watchFile-option-in-configFile.js    |   8 +-
 337 files changed, 3931 insertions(+), 3576 deletions(-)
 create mode 100644 tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 6cdcc6a26b9e4..ba669009e31c4 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -517,7 +517,7 @@ namespace ts {
         useCaseSensitiveFileNames: boolean;
         getCurrentDirectory: System["getCurrentDirectory"];
         getAccessibleSortedChildDirectories(path: string): readonly string[];
-        directoryExists(dir: string): boolean;
+        fileSystemEntryExists: FileSystemEntryExists;
         realpath(s: string): string;
         setTimeout: NonNullable<System["setTimeout"]>;
         clearTimeout: NonNullable<System["clearTimeout"]>;
@@ -534,7 +534,7 @@ namespace ts {
         useCaseSensitiveFileNames,
         getCurrentDirectory,
         getAccessibleSortedChildDirectories,
-        directoryExists,
+        fileSystemEntryExists,
         realpath,
         setTimeout,
         clearTimeout
@@ -654,7 +654,7 @@ namespace ts {
         function nonSyncUpdateChildWatches(dirName: string, dirPath: Path, fileName: string, options: WatchOptions | undefined) {
             // Iterate through existing children and update the watches if needed
             const parentWatcher = cache.get(dirPath);
-            if (parentWatcher && directoryExists(dirName)) {
+            if (parentWatcher && fileSystemEntryExists(dirName, FileSystemEntryKind.Directory)) {
                 // Schedule the update and postpone invoke for callbacks
                 scheduleUpdateChildWatches(dirName, dirPath, fileName, options);
                 return;
@@ -732,7 +732,7 @@ namespace ts {
             if (!parentWatcher) return false;
             let newChildWatches: ChildDirectoryWatcher[] | undefined;
             const hasChanges = enumerateInsertsAndDeletes<string, ChildDirectoryWatcher>(
-                directoryExists(parentDir) ? mapDefined(getAccessibleSortedChildDirectories(parentDir), child => {
+                fileSystemEntryExists(parentDir, FileSystemEntryKind.Directory) ? mapDefined(getAccessibleSortedChildDirectories(parentDir), child => {
                     const childFullName = getNormalizedAbsolutePath(child, parentDir);
                     // Filter our the symbolic link directories since those arent included in recursive watch
                     // which is same behaviour when recursive: true is passed to fs.watch
@@ -779,7 +779,12 @@ namespace ts {
     export type FsWatchCallback = (eventName: "rename" | "change", relativeFileName: string | undefined) => void;
     /*@internal*/
     export type FsWatch = (fileOrDirectory: string, entryKind: FileSystemEntryKind, callback: FsWatchCallback, recursive: boolean, fallbackPollingInterval: PollingInterval, fallbackOptions: WatchOptions | undefined) => FileWatcher;
-
+    /*@internal*/
+    export interface FsWatchWorkerWatcher extends FileWatcher {
+        on(eventName: string, listener: () => void): void;
+    }
+    /*@internal*/
+    export type FsWatchWorker = (fileOrDirectory: string, recursive: boolean, callback: FsWatchCallback) => FsWatchWorkerWatcher;
     /*@internal*/
     export const enum FileSystemEntryKind {
         File,
@@ -794,11 +799,11 @@ namespace ts {
     function createFsWatchCallbackForFileWatcherCallback(
         fileName: string,
         callback: FileWatcherCallback,
-        fileExists: System["fileExists"]
+        fileSystemEntryExists: FileSystemEntryExists
     ): FsWatchCallback {
         return eventName => {
             if (eventName === "rename") {
-                callback(fileName, fileExists(fileName) ? FileWatcherEventKind.Created : FileWatcherEventKind.Deleted);
+                callback(fileName, fileSystemEntryExists(fileName, FileSystemEntryKind.File) ? FileWatcherEventKind.Created : FileWatcherEventKind.Deleted);
             }
             else {
                 // Change
@@ -840,6 +845,9 @@ namespace ts {
         };
     }
 
+    /*@internal*/
+    export type FileSystemEntryExists = (fileorDirectrory: string, entryKind: FileSystemEntryKind) => boolean;
+
     /*@internal*/
     export interface CreateSystemWatchFunctions {
         // Polling watch file
@@ -849,12 +857,11 @@ namespace ts {
         setTimeout: NonNullable<System["setTimeout"]>;
         clearTimeout: NonNullable<System["clearTimeout"]>;
         // For fs events :
-        fsWatch: FsWatch;
-        fileExists: System["fileExists"];
+        fsWatchWorker: FsWatchWorker;
+        fileSystemEntryExists: FileSystemEntryExists;
         useCaseSensitiveFileNames: boolean;
         getCurrentDirectory: System["getCurrentDirectory"];
         fsSupportsRecursiveFsWatch: boolean;
-        directoryExists: System["directoryExists"];
         getAccessibleSortedChildDirectories(path: string): readonly string[];
         realpath(s: string): string;
         // For backward compatibility environment variables
@@ -862,6 +869,8 @@ namespace ts {
         useNonPollingWatchers?: boolean;
         tscWatchDirectory: string | undefined;
         defaultWatchFileKind: System["defaultWatchFileKind"];
+        inodeWatching: boolean;
+        sysLog: (s: string) => void;
     }
 
     /*@internal*/
@@ -870,23 +879,25 @@ namespace ts {
         getModifiedTime,
         setTimeout,
         clearTimeout,
-        fsWatch,
-        fileExists,
+        fsWatchWorker,
+        fileSystemEntryExists,
         useCaseSensitiveFileNames,
         getCurrentDirectory,
         fsSupportsRecursiveFsWatch,
-        directoryExists,
         getAccessibleSortedChildDirectories,
         realpath,
         tscWatchFile,
         useNonPollingWatchers,
         tscWatchDirectory,
         defaultWatchFileKind,
+        inodeWatching,
+        sysLog,
     }: CreateSystemWatchFunctions): { watchFile: HostWatchFile; watchDirectory: HostWatchDirectory; } {
         let dynamicPollingWatchFile: HostWatchFile | undefined;
         let fixedChunkSizePollingWatchFile: HostWatchFile | undefined;
         let nonPollingWatchFile: HostWatchFile | undefined;
         let hostRecursiveDirectoryWatcher: HostWatchDirectory | undefined;
+        let hitSystemWatcherLimit = false;
         return {
             watchFile,
             watchDirectory
@@ -908,7 +919,7 @@ namespace ts {
                     return fsWatch(
                         fileName,
                         FileSystemEntryKind.File,
-                        createFsWatchCallbackForFileWatcherCallback(fileName, callback, fileExists),
+                        createFsWatchCallbackForFileWatcherCallback(fileName, callback, fileSystemEntryExists),
                         /*recursive*/ false,
                         pollingInterval,
                         getFallbackOptions(options)
@@ -988,7 +999,7 @@ namespace ts {
                 hostRecursiveDirectoryWatcher = createDirectoryWatcherSupportingRecursive({
                     useCaseSensitiveFileNames,
                     getCurrentDirectory,
-                    directoryExists,
+                    fileSystemEntryExists,
                     getAccessibleSortedChildDirectories,
                     watchDirectory: nonRecursiveWatchDirectory,
                     realpath,
@@ -1058,6 +1069,125 @@ namespace ts {
                     };
             }
         }
+
+        function fsWatch(
+            fileOrDirectory: string,
+            entryKind: FileSystemEntryKind,
+            callback: FsWatchCallback,
+            recursive: boolean,
+            fallbackPollingInterval: PollingInterval,
+            fallbackOptions: WatchOptions | undefined
+        ): FileWatcher {
+            let lastDirectoryPartWithDirectorySeparator: string | undefined;
+            let lastDirectoryPart: string | undefined;
+            if (inodeWatching) {
+                lastDirectoryPartWithDirectorySeparator = fileOrDirectory.substr(fileOrDirectory.lastIndexOf(directorySeparator));
+                lastDirectoryPart = lastDirectoryPartWithDirectorySeparator.slice(directorySeparator.length);
+            }
+            /** Watcher for the file system entry depending on whether it is missing or present */
+            let watcher = !fileSystemEntryExists(fileOrDirectory, entryKind) ?
+                watchMissingFileSystemEntry() :
+                watchPresentFileSystemEntry();
+            return {
+                close: () => {
+                    // Close the watcher (either existing file system entry watcher or missing file system entry watcher)
+                    watcher.close();
+                    watcher = undefined!;
+                }
+            };
+
+            /**
+             * Invoke the callback with rename and update the watcher if not closed
+             * @param createWatcher
+             */
+            function invokeCallbackAndUpdateWatcher(createWatcher: () => FileWatcher) {
+                sysLog(`sysLog:: ${fileOrDirectory}:: Changing watcher to ${createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing"}FileSystemEntryWatcher`);
+                // Call the callback for current directory
+                callback("rename", "");
+
+                // If watcher is not closed, update it
+                if (watcher) {
+                    watcher.close();
+                    watcher = createWatcher();
+                }
+            }
+
+            /**
+             * Watch the file or directory that is currently present
+             * and when the watched file or directory is deleted, switch to missing file system entry watcher
+             */
+            function watchPresentFileSystemEntry(): FileWatcher {
+                if (hitSystemWatcherLimit) {
+                    sysLog(`sysLog:: ${fileOrDirectory}:: Defaulting to watchFile`);
+                    return watchPresentFileSystemEntryWithFsWatchFile();
+                }
+                try {
+                    const presentWatcher = fsWatchWorker(
+                        fileOrDirectory,
+                        recursive,
+                        inodeWatching ?
+                            callbackChangingToMissingFileSystemEntry :
+                            callback
+                    );
+                    // Watch the missing file or directory or error
+                    presentWatcher.on("error", () => invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry));
+                    return presentWatcher;
+                }
+                catch (e) {
+                    // Catch the exception and use polling instead
+                    // Eg. on linux the number of watches are limited and one could easily exhaust watches and the exception ENOSPC is thrown when creating watcher at that point
+                    // so instead of throwing error, use fs.watchFile
+                    hitSystemWatcherLimit ||= e.code === "ENOSPC";
+                    sysLog(`sysLog:: ${fileOrDirectory}:: Changing to watchFile`);
+                    return watchPresentFileSystemEntryWithFsWatchFile();
+                }
+            }
+
+            function callbackChangingToMissingFileSystemEntry(event: "rename" | "change", relativeName: string | undefined) {
+                // because relativeName is not guaranteed to be correct we need to check on each rename with few combinations
+                // Eg on ubuntu while watching app/node_modules the relativeName is "node_modules" which is neither relative nor full path
+                return event === "rename" &&
+                    (!relativeName ||
+                        relativeName === lastDirectoryPart ||
+                        (relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator!) !== -1 && relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator!) === relativeName.length - lastDirectoryPartWithDirectorySeparator!.length)) &&
+                    !fileSystemEntryExists(fileOrDirectory, entryKind) ?
+                    invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry) :
+                    callback(event, relativeName);
+            }
+
+            /**
+             * Watch the file or directory using fs.watchFile since fs.watch threw exception
+             * Eg. on linux the number of watches are limited and one could easily exhaust watches and the exception ENOSPC is thrown when creating watcher at that point
+             */
+            function watchPresentFileSystemEntryWithFsWatchFile(): FileWatcher {
+                return watchFile(
+                    fileOrDirectory,
+                    createFileWatcherCallback(callback),
+                    fallbackPollingInterval,
+                    fallbackOptions
+                );
+            }
+
+            /**
+             * Watch the file or directory that is missing
+             * and switch to existing file or directory when the missing filesystem entry is created
+             */
+            function watchMissingFileSystemEntry(): FileWatcher {
+                return watchFile(
+                    fileOrDirectory,
+                    (_fileName, eventKind) => {
+                        if (eventKind === FileWatcherEventKind.Created && fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                            // Call the callback for current file or directory
+                            // For now it could be callback for the inner directory creation,
+                            // but just return current directory, better than current no-op
+                            invokeCallbackAndUpdateWatcher(watchPresentFileSystemEntry);
+                        }
+                    },
+                    fallbackPollingInterval,
+                    fallbackOptions
+                );
+            }
+        }
     }
 
     /**
@@ -1272,8 +1402,6 @@ namespace ts {
             let activeSession: import("inspector").Session | "stopping" | undefined;
             let profilePath = "./profile.cpuprofile";
 
-            let hitSystemWatcherLimit = false;
-
             const Buffer: {
                 new (input: string, encoding?: string): any;
                 from?(input: string, encoding?: string): any;
@@ -1294,20 +1422,21 @@ namespace ts {
                 getModifiedTime,
                 setTimeout,
                 clearTimeout,
-                fsWatch,
+                fsWatchWorker,
                 useCaseSensitiveFileNames,
                 getCurrentDirectory,
-                fileExists,
+                fileSystemEntryExists,
                 // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
                 // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
                 fsSupportsRecursiveFsWatch,
-                directoryExists,
                 getAccessibleSortedChildDirectories: path => getAccessibleFileSystemEntries(path).directories,
                 realpath,
                 tscWatchFile: process.env.TSC_WATCHFILE,
                 useNonPollingWatchers: process.env.TSC_NONPOLLING_WATCHER,
                 tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
                 defaultWatchFileKind: () => sys!.defaultWatchFileKind?.(),
+                inodeWatching: isLinuxOrMacOs,
+                sysLog,
             });
             const nodeSystem: System = {
                 args: process.argv.slice(2),
@@ -1568,135 +1697,19 @@ namespace ts {
                 }
             }
 
-            function fsWatch(
+            function fsWatchWorker(
                 fileOrDirectory: string,
-                entryKind: FileSystemEntryKind,
-                callback: FsWatchCallback,
                 recursive: boolean,
-                fallbackPollingInterval: PollingInterval,
-                fallbackOptions: WatchOptions | undefined
-            ): FileWatcher {
-                let options: any;
-                let lastDirectoryPartWithDirectorySeparator: string | undefined;
-                let lastDirectoryPart: string | undefined;
-                if (isLinuxOrMacOs) {
-                    lastDirectoryPartWithDirectorySeparator = fileOrDirectory.substr(fileOrDirectory.lastIndexOf(directorySeparator));
-                    lastDirectoryPart = lastDirectoryPartWithDirectorySeparator.slice(directorySeparator.length);
-                }
-                /** Watcher for the file system entry depending on whether it is missing or present */
-                let watcher = !fileSystemEntryExists(fileOrDirectory, entryKind) ?
-                    watchMissingFileSystemEntry() :
-                    watchPresentFileSystemEntry();
-                return {
-                    close: () => {
-                        // Close the watcher (either existing file system entry watcher or missing file system entry watcher)
-                        watcher.close();
-                        watcher = undefined!;
-                    }
-                };
-
-                /**
-                 * Invoke the callback with rename and update the watcher if not closed
-                 * @param createWatcher
-                 */
-                function invokeCallbackAndUpdateWatcher(createWatcher: () => FileWatcher) {
-                    sysLog(`sysLog:: ${fileOrDirectory}:: Changing watcher to ${createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing"}FileSystemEntryWatcher`);
-                    // Call the callback for current directory
-                    callback("rename", "");
-
-                    // If watcher is not closed, update it
-                    if (watcher) {
-                        watcher.close();
-                        watcher = createWatcher();
-                    }
-                }
-
-                /**
-                 * Watch the file or directory that is currently present
-                 * and when the watched file or directory is deleted, switch to missing file system entry watcher
-                 */
-                function watchPresentFileSystemEntry(): FileWatcher {
-                    // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
-                    // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
-                    if (options === undefined) {
-                        if (fsSupportsRecursiveFsWatch) {
-                            options = { persistent: true, recursive: !!recursive };
-                        }
-                        else {
-                            options = { persistent: true };
-                        }
-                    }
-
-                    if (hitSystemWatcherLimit) {
-                        sysLog(`sysLog:: ${fileOrDirectory}:: Defaulting to fsWatchFile`);
-                        return watchPresentFileSystemEntryWithFsWatchFile();
-                    }
-                    try {
-                        const presentWatcher = _fs.watch(
-                            fileOrDirectory,
-                            options,
-                            isLinuxOrMacOs ?
-                                callbackChangingToMissingFileSystemEntry :
-                                callback
-                        );
-                        // Watch the missing file or directory or error
-                        presentWatcher.on("error", () => invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry));
-                        return presentWatcher;
-                    }
-                    catch (e) {
-                        // Catch the exception and use polling instead
-                        // Eg. on linux the number of watches are limited and one could easily exhaust watches and the exception ENOSPC is thrown when creating watcher at that point
-                        // so instead of throwing error, use fs.watchFile
-                        hitSystemWatcherLimit ||= e.code === "ENOSPC";
-                        sysLog(`sysLog:: ${fileOrDirectory}:: Changing to fsWatchFile`);
-                        return watchPresentFileSystemEntryWithFsWatchFile();
-                    }
-                }
-
-                function callbackChangingToMissingFileSystemEntry(event: "rename" | "change", relativeName: string | undefined) {
-                    // because relativeName is not guaranteed to be correct we need to check on each rename with few combinations
-                    // Eg on ubuntu while watching app/node_modules the relativeName is "node_modules" which is neither relative nor full path
-                    return event === "rename" &&
-                        (!relativeName ||
-                            relativeName === lastDirectoryPart ||
-                            (relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator!) !== -1 && relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator!) === relativeName.length - lastDirectoryPartWithDirectorySeparator!.length)) &&
-                        !fileSystemEntryExists(fileOrDirectory, entryKind) ?
-                        invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry) :
-                        callback(event, relativeName);
-                }
-
-                /**
-                 * Watch the file or directory using fs.watchFile since fs.watch threw exception
-                 * Eg. on linux the number of watches are limited and one could easily exhaust watches and the exception ENOSPC is thrown when creating watcher at that point
-                 */
-                function watchPresentFileSystemEntryWithFsWatchFile(): FileWatcher {
-                    return watchFile(
-                        fileOrDirectory,
-                        createFileWatcherCallback(callback),
-                        fallbackPollingInterval,
-                        fallbackOptions
-                    );
-                }
-
-                /**
-                 * Watch the file or directory that is missing
-                 * and switch to existing file or directory when the missing filesystem entry is created
-                 */
-                function watchMissingFileSystemEntry(): FileWatcher {
-                    return watchFile(
-                        fileOrDirectory,
-                        (_fileName, eventKind) => {
-                            if (eventKind === FileWatcherEventKind.Created && fileSystemEntryExists(fileOrDirectory, entryKind)) {
-                                // Call the callback for current file or directory
-                                // For now it could be callback for the inner directory creation,
-                                // but just return current directory, better than current no-op
-                                invokeCallbackAndUpdateWatcher(watchPresentFileSystemEntry);
-                            }
-                        },
-                        fallbackPollingInterval,
-                        fallbackOptions
-                    );
-                }
+                callback: FsWatchCallback,
+            ) {
+                // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
+                // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
+                return _fs.watch(
+                    fileOrDirectory,
+                    fsSupportsRecursiveFsWatch ?
+                        { persistent: true, recursive: !!recursive } : { persistent: true },
+                    callback
+                );
             }
 
             function readFileWorker(fileName: string, _encoding?: string): string | undefined {
diff --git a/src/harness/virtualFileSystemWithWatch.ts b/src/harness/virtualFileSystemWithWatch.ts
index 80746cff259c7..90763f7cf62c1 100644
--- a/src/harness/virtualFileSystemWithWatch.ts
+++ b/src/harness/virtualFileSystemWithWatch.ts
@@ -39,6 +39,7 @@ interface Array<T> { length: number; [n: number]: T; }`
         environmentVariables?: ESMap<string, string>;
         runWithoutRecursiveWatches?: boolean;
         runWithFallbackPolling?: boolean;
+        inodeWatching?: boolean;
     }
 
     export function createWatchedSystem(fileOrFolderList: readonly FileOrFolderOrSymLink[], params?: TestServerHostCreationParameters): TestServerHost {
@@ -272,8 +273,7 @@ interface Array<T> { length: number; [n: number]: T; }`
     export interface TestFsWatcher {
         cb: FsWatchCallback;
         directoryName: string;
-        fallbackPollingInterval: PollingInterval;
-        fallbackOptions: WatchOptions | undefined;
+        inode: number | undefined;
     }
 
     export interface ReloadWatchInvokeOptions {
@@ -334,6 +334,8 @@ interface Array<T> { length: number; [n: number]: T; }`
         public defaultWatchFileKind?: () => WatchFileKind | undefined;
         public storeFilesChangingSignatureDuringEmit = true;
         watchFile: HostWatchFile;
+        private readonly inodeWatching: boolean | undefined;
+        private readonly inodes?: ESMap<Path, number>;
         watchDirectory: HostWatchDirectory;
         constructor(
             public withSafeList: boolean,
@@ -341,7 +343,8 @@ interface Array<T> { length: number; [n: number]: T; }`
             {
                 useCaseSensitiveFileNames, executingFilePath, currentDirectory,
                 newLine, windowsStyleRoot, environmentVariables,
-                runWithoutRecursiveWatches, runWithFallbackPolling
+                runWithoutRecursiveWatches, runWithFallbackPolling,
+                inodeWatching,
             }: TestServerHostCreationParameters = {}) {
             this.useCaseSensitiveFileNames = !!useCaseSensitiveFileNames;
             this.newLine = newLine || "\n";
@@ -355,6 +358,11 @@ interface Array<T> { length: number; [n: number]: T; }`
             this.runWithFallbackPolling = !!runWithFallbackPolling;
             const tscWatchFile = this.environmentVariables && this.environmentVariables.get("TSC_WATCHFILE");
             const tscWatchDirectory = this.environmentVariables && this.environmentVariables.get("TSC_WATCHDIRECTORY");
+            if (inodeWatching) {
+                this.inodeWatching = true;
+                this.inodes = new Map();
+            }
+
             const { watchFile, watchDirectory } = createSystemWatchFunctions({
                 // We dont have polling watch file
                 // it is essentially fsWatch but lets get that separate from fsWatch and
@@ -368,23 +376,29 @@ interface Array<T> { length: number; [n: number]: T; }`
                 getModifiedTime: this.getModifiedTime.bind(this),
                 setTimeout: this.setTimeout.bind(this),
                 clearTimeout: this.clearTimeout.bind(this),
-                fsWatch: this.fsWatch.bind(this),
-                fileExists: this.fileExists.bind(this),
+                fsWatchWorker: this.fsWatchWorker.bind(this),
+                fileSystemEntryExists: this.fileSystemEntryExists.bind(this),
                 useCaseSensitiveFileNames: this.useCaseSensitiveFileNames,
                 getCurrentDirectory: this.getCurrentDirectory.bind(this),
                 fsSupportsRecursiveFsWatch: tscWatchDirectory ? false : !runWithoutRecursiveWatches,
-                directoryExists: this.directoryExists.bind(this),
                 getAccessibleSortedChildDirectories: path => this.getDirectories(path),
                 realpath: this.realpath.bind(this),
                 tscWatchFile,
                 tscWatchDirectory,
                 defaultWatchFileKind: () => this.defaultWatchFileKind?.(),
+                inodeWatching: !!this.inodeWatching,
+                sysLog: this.write.bind(this)
             });
             this.watchFile = watchFile;
             this.watchDirectory = watchDirectory;
             this.reloadFS(fileOrFolderorSymLinkList);
         }
 
+        private nextInode = 0;
+        private setInode(path: Path) {
+            if (this.inodes) this.inodes.set(path, this.nextInode++);
+        }
+
         // Output is pretty
         writeOutputIsTTY() {
             return true;
@@ -414,7 +428,7 @@ interface Array<T> { length: number; [n: number]: T; }`
             return new Date(this.time);
         }
 
-        private reloadFS(fileOrFolderOrSymLinkList: readonly FileOrFolderOrSymLink[], options?: Partial<ReloadWatchInvokeOptions>) {
+        private reloadFS(fileOrFolderOrSymLinkList: readonly FileOrFolderOrSymLink[]) {
             Debug.assert(this.fs.size === 0);
             fileOrFolderOrSymLinkList = fileOrFolderOrSymLinkList.concat(this.withSafeList ? safeList : []);
             const filesOrFoldersToLoad: readonly FileOrFolderOrSymLink[] = !this.windowsStyleRoot ? fileOrFolderOrSymLinkList :
@@ -432,7 +446,7 @@ interface Array<T> { length: number; [n: number]: T; }`
                         if (isFile(fileOrDirectory)) {
                             // Update file
                             if (currentEntry.content !== fileOrDirectory.content) {
-                                this.modifyFile(fileOrDirectory.path, fileOrDirectory.content, options);
+                                this.modifyFile(fileOrDirectory.path, fileOrDirectory.content);
                             }
                         }
                         else {
@@ -455,7 +469,7 @@ interface Array<T> { length: number; [n: number]: T; }`
                     }
                 }
                 else {
-                    this.ensureFileOrFolder(fileOrDirectory, options && options.ignoreWatchInvokedWithTriggerAsFileCreate);
+                    this.ensureFileOrFolder(fileOrDirectory);
                 }
             }
         }
@@ -541,6 +555,7 @@ interface Array<T> { length: number; [n: number]: T; }`
                     newFolder.entries.push(entry);
                 }
                 this.fs.set(entry.path, entry);
+                this.setInode(entry.path);
                 this.invokeFileAndFsWatches(entry.fullPath, FileWatcherEventKind.Created);
                 if (isFsFolder(entry)) {
                     this.renameFolderEntries(entry, entry);
@@ -585,6 +600,7 @@ interface Array<T> { length: number; [n: number]: T; }`
                     // root folder
                     Debug.assert(this.fs.size === 0 || !!this.windowsStyleRoot);
                     this.fs.set(path, folder);
+                    this.setInode(path);
                 }
             }
             Debug.assert(isFsFolder(folder));
@@ -597,6 +613,7 @@ interface Array<T> { length: number; [n: number]: T; }`
             }
             folder.modifiedTime = this.now();
             this.fs.set(fileOrDirectory.path, fileOrDirectory);
+            this.setInode(fileOrDirectory.path);
 
             if (ignoreWatch) {
                 return;
@@ -619,6 +636,7 @@ interface Array<T> { length: number; [n: number]: T; }`
                 Debug.assert(fileOrDirectory.entries.length === 0 || isRenaming);
             }
             this.invokeFileAndFsWatches(fileOrDirectory.fullPath, FileWatcherEventKind.Deleted);
+            this.inodes?.delete(fileOrDirectory.path);
             this.invokeFileAndFsWatches(baseFolder.fullPath, FileWatcherEventKind.Changed);
             if (basePath !== fileOrDirectory.path &&
                 baseFolder.entries.length === 0 &&
@@ -660,30 +678,26 @@ interface Array<T> { length: number; [n: number]: T; }`
             );
         }
 
-        private fsWatch(
+        private fsWatchWorker(
             fileOrDirectory: string,
-            _entryKind: FileSystemEntryKind,
-            cb: FsWatchCallback,
             recursive: boolean,
-            fallbackPollingInterval: PollingInterval,
-            fallbackOptions: WatchOptions | undefined): FileWatcher {
-            return this.runWithFallbackPolling ?
-                this.watchFile(
-                    fileOrDirectory,
-                    createFileWatcherCallback(cb),
-                    fallbackPollingInterval,
-                    fallbackOptions
-                ) :
-                createWatcher(
-                    recursive ? this.fsWatchesRecursive : this.fsWatches,
-                    this.toFullPath(fileOrDirectory),
-                    {
-                        directoryName: fileOrDirectory,
-                        cb,
-                        fallbackPollingInterval,
-                        fallbackOptions
-                    }
-                );
+            cb: FsWatchCallback,
+        ) {
+            if (this.runWithFallbackPolling) throw new Error("Need to use fallback polling instead of file system native watching");
+            const path = this.toFullPath(fileOrDirectory);
+            // Error if the path does not exist
+            if (this.inodeWatching && !this.inodes?.has(path)) throw new Error();
+            const result = createWatcher(
+                recursive ? this.fsWatchesRecursive : this.fsWatches,
+                path,
+                {
+                    directoryName: fileOrDirectory,
+                    cb,
+                    inode: this.inodes?.get(path)
+                }
+            ) as FsWatchWorkerWatcher;
+            result.on = noop;
+            return result;
         }
 
         invokeFileWatcher(fileFullPath: string, eventKind: FileWatcherEventKind, useFileNameInCallback?: boolean) {
@@ -691,7 +705,13 @@ interface Array<T> { length: number; [n: number]: T; }`
         }
 
         private fsWatchCallback(map: MultiMap<Path, TestFsWatcher>, fullPath: string, eventName: "rename" | "change", entryFullPath?: string) {
-            invokeWatcherCallbacks(map.get(this.toPath(fullPath)), ({ cb }) => cb(eventName, entryFullPath ? this.getRelativePathToDirectory(fullPath, entryFullPath) : ""));
+            const path = this.toPath(fullPath);
+            const currentInode = this.inodes?.get(path);
+            invokeWatcherCallbacks(map.get(path), ({ cb, inode }) => {
+                // TODO::
+                if (this.inodeWatching && inode !== undefined && inode !== currentInode) return;
+                cb(eventName, entryFullPath ? this.getRelativePathToDirectory(fullPath, entryFullPath) : "");
+            });
         }
 
         invokeFsWatchesCallbacks(fullPath: string, eventName: "rename" | "change", entryFullPath?: string) {
@@ -791,6 +811,10 @@ interface Array<T> { length: number; [n: number]: T; }`
             return this.getRealFsEntry(isFsFolder, path, fsEntry);
         }
 
+        fileSystemEntryExists(s: string, entryKind: FileSystemEntryKind) {
+            return entryKind === FileSystemEntryKind.File ? this.fileExists(s) : this.directoryExists(s);
+        }
+
         fileExists(s: string) {
             const path = this.toFullPath(s);
             return !!this.getRealFile(path);
@@ -1005,14 +1029,14 @@ interface Array<T> { length: number; [n: number]: T; }`
         }
 
         writtenFiles?: ESMap<Path, number>;
-        diff(baseline: string[], base: ESMap<string, FSEntry> = new Map()) {
-            this.fs.forEach(newFsEntry => {
-                diffFsEntry(baseline, base.get(newFsEntry.path), newFsEntry, this.writtenFiles);
+        diff(baseline: string[], base: ESMap<Path, FSEntry> = new Map()) {
+            this.fs.forEach((newFsEntry, path) => {
+                diffFsEntry(baseline, base.get(path), newFsEntry, this.inodes?.get(path), this.writtenFiles);
             });
-            base.forEach(oldFsEntry => {
-                const newFsEntry = this.fs.get(oldFsEntry.path);
+            base.forEach((oldFsEntry, path) => {
+                const newFsEntry = this.fs.get(path);
                 if (!newFsEntry) {
-                    diffFsEntry(baseline, oldFsEntry, newFsEntry, this.writtenFiles);
+                    diffFsEntry(baseline, oldFsEntry, newFsEntry, this.inodes?.get(path), this.writtenFiles);
                 }
             });
             baseline.push("");
@@ -1059,86 +1083,77 @@ interface Array<T> { length: number; [n: number]: T; }`
         }
     }
 
-    function diffFsFile(baseline: string[], fsEntry: FsFile) {
-        baseline.push(`//// [${fsEntry.fullPath}]\r\n${fsEntry.content}`, "");
+    function diffFsFile(baseline: string[], fsEntry: FsFile, newInode: number | undefined) {
+        baseline.push(`//// [${fsEntry.fullPath}]${inodeString(newInode)}\r\n${fsEntry.content}`, "");
+    }
+    function diffFsSymLink(baseline: string[], fsEntry: FsSymLink, newInode: number | undefined) {
+        baseline.push(`//// [${fsEntry.fullPath}] symlink(${fsEntry.symLink})${inodeString(newInode)}`);
     }
-    function diffFsSymLink(baseline: string[], fsEntry: FsSymLink) {
-        baseline.push(`//// [${fsEntry.fullPath}] symlink(${fsEntry.symLink})`);
+    function inodeString(inode: number | undefined) {
+        return inode !== undefined ? ` Inode:: ${inode}` : "";
     }
-    function diffFsEntry(baseline: string[], oldFsEntry: FSEntry | undefined, newFsEntry: FSEntry | undefined, writtenFiles: ESMap<string, any> | undefined): void {
+    function diffFsEntry(baseline: string[], oldFsEntry: FSEntry | undefined, newFsEntry: FSEntry | undefined, newInode: number | undefined, writtenFiles: ESMap<string, any> | undefined): void {
         const file = newFsEntry && newFsEntry.fullPath;
         if (isFsFile(oldFsEntry)) {
             if (isFsFile(newFsEntry)) {
                 if (oldFsEntry.content !== newFsEntry.content) {
-                    diffFsFile(baseline, newFsEntry);
+                    diffFsFile(baseline, newFsEntry, newInode);
                 }
                 else if (oldFsEntry.modifiedTime !== newFsEntry.modifiedTime) {
                     if (oldFsEntry.fullPath !== newFsEntry.fullPath) {
-                        baseline.push(`//// [${file}] file was renamed from file ${oldFsEntry.fullPath}`);
+                        baseline.push(`//// [${file}] file was renamed from file ${oldFsEntry.fullPath}${inodeString(newInode)}`);
                     }
                     else if (writtenFiles && !writtenFiles.has(newFsEntry.path)) {
-                        baseline.push(`//// [${file}] file changed its modified time`);
+                        baseline.push(`//// [${file}] file changed its modified time${inodeString(newInode)}`);
                     }
                     else {
-                        baseline.push(`//// [${file}] file written with same contents`);
+                        baseline.push(`//// [${file}] file written with same contents${inodeString(newInode)}`);
                     }
                 }
             }
             else {
                 baseline.push(`//// [${oldFsEntry.fullPath}] deleted`);
                 if (isFsSymLink(newFsEntry)) {
-                    diffFsSymLink(baseline, newFsEntry);
+                    diffFsSymLink(baseline, newFsEntry, newInode);
                 }
             }
         }
         else if (isFsSymLink(oldFsEntry)) {
             if (isFsSymLink(newFsEntry)) {
                 if (oldFsEntry.symLink !== newFsEntry.symLink) {
-                    diffFsSymLink(baseline, newFsEntry);
+                    diffFsSymLink(baseline, newFsEntry, newInode);
                 }
                 else if (oldFsEntry.modifiedTime !== newFsEntry.modifiedTime) {
                     if (oldFsEntry.fullPath !== newFsEntry.fullPath) {
-                        baseline.push(`//// [${file}] symlink was renamed from symlink ${oldFsEntry.fullPath}`);
+                        baseline.push(`//// [${file}] symlink was renamed from symlink ${oldFsEntry.fullPath}${inodeString(newInode)}`);
                     }
                     else if (writtenFiles && !writtenFiles.has(newFsEntry.path)) {
-                        baseline.push(`//// [${file}] symlink changed its modified time`);
+                        baseline.push(`//// [${file}] symlink changed its modified time${inodeString(newInode)}`);
                     }
                     else {
-                        baseline.push(`//// [${file}] symlink written with same link`);
+                        baseline.push(`//// [${file}] symlink written with same link${inodeString(newInode)}`);
                     }
                 }
             }
             else {
                 baseline.push(`//// [${oldFsEntry.fullPath}] deleted symlink`);
                 if (isFsFile(newFsEntry)) {
-                    diffFsFile(baseline, newFsEntry);
+                    diffFsFile(baseline, newFsEntry, newInode);
                 }
             }
         }
         else if (isFsFile(newFsEntry)) {
-            diffFsFile(baseline, newFsEntry);
+            diffFsFile(baseline, newFsEntry, newInode);
         }
         else if (isFsSymLink(newFsEntry)) {
-            diffFsSymLink(baseline, newFsEntry);
+            diffFsSymLink(baseline, newFsEntry, newInode);
         }
     }
 
-    function serializeTestFsWatcher({ directoryName, fallbackPollingInterval, fallbackOptions }: TestFsWatcher) {
+    function serializeTestFsWatcher({ directoryName, inode }: TestFsWatcher) {
         return {
             directoryName,
-            fallbackPollingInterval,
-            fallbackOptions: serializeWatchOptions(fallbackOptions)
-        };
-    }
-
-    function serializeWatchOptions(fallbackOptions: WatchOptions | undefined) {
-        if (!fallbackOptions) return undefined;
-        const { watchFile, watchDirectory, fallbackPolling, ...rest } = fallbackOptions;
-        return {
-            watchFile: watchFile !== undefined ? WatchFileKind[watchFile] : undefined,
-            watchDirectory: watchDirectory !== undefined ? WatchDirectoryKind[watchDirectory] : undefined,
-            fallbackPolling: fallbackPolling !== undefined ? PollingWatchKind[fallbackPolling] : undefined,
-            ...rest
+            inode,
         };
     }
 
diff --git a/src/testRunner/unittests/tscWatch/watchEnvironment.ts b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
index d02afa3137714..72081fdb0c775 100644
--- a/src/testRunner/unittests/tscWatch/watchEnvironment.ts
+++ b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
@@ -581,5 +581,41 @@ namespace ts.tscWatch {
                 verifyWorker("-extendedDiagnostics");
             });
         });
+
+        describe("with fsWatch on inodes", () => {
+            verifyTscWatch({
+                scenario,
+                subScenario: `fsWatch/when using file watching thats on inode`,
+                commandLineArgs: ["-w", "--extendedDiagnostics"],
+                sys: () => {
+                    const configFile: File = {
+                        path: `${projectRoot}/tsconfig.json`,
+                        content: JSON.stringify({ watchOptions: { watchFile: "useFsEvents" }, files: ["foo.d.ts", "main.ts"] })
+                    };
+                    const main: File = {
+                        path: `${projectRoot}/main.ts`,
+                        content: `import { foo } from "./foo"; foo();`
+                    };
+                    const foo: File = {
+                        path: `${projectRoot}/foo.d.ts`,
+                        content: `export function foo(): string;`
+                    };
+                    const files = [libFile, main, foo, configFile];
+                    return createWatchedSystem(files, { currentDirectory: projectRoot, inodeWatching: true });
+                },
+                changes: [
+                    {
+                        caption: "Replace file with rename event that introduces error",
+                        change: sys => sys.modifyFile(`${projectRoot}/foo.d.ts`, `export function foo2(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true }),
+                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2),
+                    },
+                    {
+                        caption: "Replace file with rename event that fixes error",
+                        change: sys => sys.modifyFile(`${projectRoot}/foo.d.ts`, `export function foo(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true }),
+                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2),
+                    },
+                ]
+            });
+        });
     });
 }
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
index dbaea614c79d5..b36912f7aa3ec 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
@@ -273,11 +273,11 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/demo/core:
-  {"directoryName":"/user/username/projects/demo/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/core"}
 /user/username/projects/demo/animals:
-  {"directoryName":"/user/username/projects/demo/animals","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/animals"}
 /user/username/projects/demo/zoo:
-  {"directoryName":"/user/username/projects/demo/zoo","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/zoo"}
 
 exitCode:: ExitStatus.undefined
 
@@ -543,11 +543,11 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/demo/core:
-  {"directoryName":"/user/username/projects/demo/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/core"}
 /user/username/projects/demo/animals:
-  {"directoryName":"/user/username/projects/demo/animals","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/animals"}
 /user/username/projects/demo/zoo:
-  {"directoryName":"/user/username/projects/demo/zoo","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/zoo"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
index 2b7648cb5a452..e8f43afdbba83 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
@@ -193,11 +193,11 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/demo/animals:
-  {"directoryName":"/user/username/projects/demo/animals","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/animals"}
 /user/username/projects/demo/zoo:
-  {"directoryName":"/user/username/projects/demo/zoo","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/zoo"}
 /user/username/projects/demo/core:
-  {"directoryName":"/user/username/projects/demo/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/core"}
 
 exitCode:: ExitStatus.undefined
 
@@ -324,11 +324,11 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/demo/animals:
-  {"directoryName":"/user/username/projects/demo/animals","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/animals"}
 /user/username/projects/demo/zoo:
-  {"directoryName":"/user/username/projects/demo/zoo","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/zoo"}
 /user/username/projects/demo/core:
-  {"directoryName":"/user/username/projects/demo/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/core"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
index 3396771bc5867..757edf9d88cf3 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
@@ -168,9 +168,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/pkg2:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg2"}
 /user/username/projects/myproject/packages/pkg1:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg1"}
 
 exitCode:: ExitStatus.undefined
 
@@ -355,9 +355,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/pkg2:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg2"}
 /user/username/projects/myproject/packages/pkg1:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg1"}
 
 exitCode:: ExitStatus.undefined
 
@@ -457,9 +457,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/pkg2:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg2"}
 /user/username/projects/myproject/packages/pkg1:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg1"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
index 69047ec74b8c5..dd21cc12fe787 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
@@ -174,9 +174,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/pkg2:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg2"}
 /user/username/projects/myproject/packages/pkg1:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg1"}
 
 exitCode:: ExitStatus.undefined
 
@@ -374,9 +374,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/pkg2:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg2"}
 /user/username/projects/myproject/packages/pkg1:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg1"}
 
 exitCode:: ExitStatus.undefined
 
@@ -483,9 +483,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/pkg2:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg2"}
 /user/username/projects/myproject/packages/pkg1:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg1"}
 
 exitCode:: ExitStatus.undefined
 
@@ -604,9 +604,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/pkg2:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg2"}
 /user/username/projects/myproject/packages/pkg1:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg1"}
 
 exitCode:: ExitStatus.undefined
 
@@ -692,9 +692,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/pkg2:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg2"}
 /user/username/projects/myproject/packages/pkg1:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg1"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
index 080ca6d1b743b..d65dcbdb946d5 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
@@ -70,7 +70,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -164,7 +164,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -217,7 +217,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
index 2d382325db2b9..fac8efbee3337 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
@@ -70,7 +70,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -116,7 +116,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -169,7 +169,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
index 8c147b7dba4b9..b85241545b864 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
@@ -87,7 +87,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -141,7 +141,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -203,7 +203,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -338,7 +338,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -467,7 +467,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -523,7 +523,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -639,7 +639,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
index dd26029f8f51e..b3fb17cc5d1e3 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
@@ -87,7 +87,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -141,7 +141,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -203,7 +203,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -281,7 +281,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -335,7 +335,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -391,7 +391,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -450,7 +450,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/creates-solution-in-watch-mode.js b/tests/baselines/reference/tsbuildWatch/programUpdates/creates-solution-in-watch-mode.js
index cdd4fcec9999d..e3aef524ea14b 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/creates-solution-in-watch-mode.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/creates-solution-in-watch-mode.js
@@ -194,9 +194,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
index 643d73446c30f..9818a6cbf848d 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
@@ -211,9 +211,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -549,9 +549,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -728,9 +728,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
index 8c730f537d280..191bed28c0501 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
@@ -64,7 +64,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/solution/app:
-  {"directoryName":"/user/username/projects/solution/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/solution/app"}
 
 exitCode:: ExitStatus.undefined
 
@@ -196,7 +196,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/solution/app:
-  {"directoryName":"/user/username/projects/solution/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/solution/app"}
 
 exitCode:: ExitStatus.undefined
 
@@ -247,7 +247,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/solution/app:
-  {"directoryName":"/user/username/projects/solution/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/solution/app"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
index 5995d27a3ddd1..b9b9221ded15b 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
@@ -64,7 +64,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/solution/app:
-  {"directoryName":"/user/username/projects/solution/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/solution/app"}
 
 exitCode:: ExitStatus.undefined
 
@@ -196,7 +196,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/solution/app:
-  {"directoryName":"/user/username/projects/solution/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/solution/app"}
 
 exitCode:: ExitStatus.undefined
 
@@ -245,7 +245,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/solution/app:
-  {"directoryName":"/user/username/projects/solution/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/solution/app"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
index 4015ea581646e..b5611cbdf261e 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
@@ -69,7 +69,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/solution/app:
-  {"directoryName":"/user/username/projects/solution/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/solution/app"}
 
 exitCode:: ExitStatus.undefined
 
@@ -120,7 +120,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/solution/app:
-  {"directoryName":"/user/username/projects/solution/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/solution/app"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
index c019a99ee91c7..b95e38e00593a 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
@@ -69,7 +69,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/solution/app:
-  {"directoryName":"/user/username/projects/solution/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/solution/app"}
 
 exitCode:: ExitStatus.undefined
 
@@ -118,7 +118,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/solution/app:
-  {"directoryName":"/user/username/projects/solution/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/solution/app"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
index a8153212b3918..0ec3a1c545cd5 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
@@ -194,9 +194,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -529,9 +529,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -685,9 +685,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
index eb6b300a47b3e..4ada4bc565f78 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
@@ -193,9 +193,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -527,9 +527,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -682,9 +682,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
index 7a9b4eeb19a32..826bc6fcd6615 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
@@ -72,7 +72,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 
 exitCode:: ExitStatus.undefined
 
@@ -165,7 +165,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 
 exitCode:: ExitStatus.undefined
 
@@ -220,7 +220,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 
 exitCode:: ExitStatus.undefined
 
@@ -308,7 +308,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
index c81779a12522e..4f5076fc359ea 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
@@ -79,7 +79,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 
 exitCode:: ExitStatus.undefined
 
@@ -180,7 +180,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 
 exitCode:: ExitStatus.undefined
 
@@ -235,7 +235,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 
 exitCode:: ExitStatus.undefined
 
@@ -330,7 +330,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/verify-building-references-watches-only-those-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/verify-building-references-watches-only-those-projects.js
index caef5fcf161d3..b22c1ca98c5a5 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/verify-building-references-watches-only-those-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/verify-building-references-watches-only-those-projects.js
@@ -166,9 +166,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
index a9713a1320982..9c056f5887166 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
@@ -115,7 +115,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 
 exitCode:: ExitStatus.undefined
 
@@ -264,9 +264,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -414,9 +414,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
index bc3d7d649a1e7..8ee1d321ec24f 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
@@ -93,9 +93,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/library:
-  {"directoryName":"/user/username/projects/sample1/library","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/library"}
 /user/username/projects/sample1/app:
-  {"directoryName":"/user/username/projects/sample1/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/app"}
 
 exitCode:: ExitStatus.undefined
 
@@ -241,9 +241,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/library:
-  {"directoryName":"/user/username/projects/sample1/library","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/library"}
 /user/username/projects/sample1/app:
-  {"directoryName":"/user/username/projects/sample1/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/app"}
 
 exitCode:: ExitStatus.undefined
 
@@ -372,9 +372,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/library:
-  {"directoryName":"/user/username/projects/sample1/library","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/library"}
 /user/username/projects/sample1/app:
-  {"directoryName":"/user/username/projects/sample1/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/app"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
index 6b2bd47dff8e2..5788471efc1e4 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
@@ -71,9 +71,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -273,9 +273,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -376,9 +376,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -525,9 +525,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -612,9 +612,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index 47c6be2b3967e..0e3c7d9d77a7d 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -168,9 +168,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -483,9 +483,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -594,9 +594,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -650,9 +650,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -711,9 +711,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -830,9 +830,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -886,9 +886,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
index c75488ba556f3..b435b9f85529b 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
@@ -168,9 +168,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -484,9 +484,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -603,9 +603,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -728,9 +728,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -868,9 +868,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -979,9 +979,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1104,9 +1104,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1246,9 +1246,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1373,9 +1373,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1498,9 +1498,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
index 3d6e66045df24..ca76fab5890bc 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -168,9 +168,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -484,9 +484,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -574,9 +574,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -614,9 +614,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index 6aafabd4097ae..6e5514c2642c9 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -194,9 +194,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -517,9 +517,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -635,9 +635,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -691,9 +691,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -752,9 +752,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -878,9 +878,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -934,9 +934,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
index d8fc2592bbe8d..d2649b5610135 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
@@ -194,9 +194,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -518,9 +518,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -643,9 +643,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -768,9 +768,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -908,9 +908,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1025,9 +1025,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1150,9 +1150,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1292,9 +1292,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1425,9 +1425,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1550,9 +1550,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
index bfe1294d29024..1a05b344ebf63 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -194,9 +194,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -518,9 +518,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -612,9 +612,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -652,9 +652,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
index fdce48d40fc42..0b05490ab3eb6 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
@@ -58,7 +58,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -101,7 +101,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
index abb8acaffde47..ced4b140b0740 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
@@ -449,7 +449,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -523,7 +523,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -585,7 +585,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
index e0df4fab62355..3458c8a45830f 100644
--- a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
+++ b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
@@ -101,9 +101,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/shared:
-  {"directoryName":"/user/username/projects/myproject/shared","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/shared"}
 /user/username/projects/myproject/webpack:
-  {"directoryName":"/user/username/projects/myproject/webpack","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/webpack"}
 
 exitCode:: ExitStatus.undefined
 
@@ -313,9 +313,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/shared:
-  {"directoryName":"/user/username/projects/myproject/shared","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/shared"}
 /user/username/projects/myproject/webpack:
-  {"directoryName":"/user/username/projects/myproject/webpack","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/webpack"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
index 0128d3c6f49ca..ae54838ae4d6b 100644
--- a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
+++ b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
@@ -145,9 +145,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/reexport/src/pure:
-  {"directoryName":"/user/username/projects/reexport/src/pure","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/reexport/src/pure"}
 /user/username/projects/reexport/src/main:
-  {"directoryName":"/user/username/projects/reexport/src/main","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/reexport/src/main"}
 
 exitCode:: ExitStatus.undefined
 
@@ -344,9 +344,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/reexport/src/pure:
-  {"directoryName":"/user/username/projects/reexport/src/pure","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/reexport/src/pure"}
 /user/username/projects/reexport/src/main:
-  {"directoryName":"/user/username/projects/reexport/src/main","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/reexport/src/main"}
 
 exitCode:: ExitStatus.undefined
 
@@ -501,9 +501,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/reexport/src/pure:
-  {"directoryName":"/user/username/projects/reexport/src/pure","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/reexport/src/pure"}
 /user/username/projects/reexport/src/main:
-  {"directoryName":"/user/username/projects/reexport/src/main","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/reexport/src/main"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
index 004678648fceb..c2fdce71e98c2 100644
--- a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
+++ b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
@@ -173,13 +173,13 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/pkg0:
-  {"directoryName":"/user/username/projects/myproject/pkg0","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg0"}
 /user/username/projects/myproject/pkg1:
-  {"directoryName":"/user/username/projects/myproject/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg1"}
 /user/username/projects/myproject/pkg2:
-  {"directoryName":"/user/username/projects/myproject/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg2"}
 /user/username/projects/myproject/pkg3:
-  {"directoryName":"/user/username/projects/myproject/pkg3","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg3"}
 
 exitCode:: ExitStatus.undefined
 
@@ -333,13 +333,13 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/pkg0:
-  {"directoryName":"/user/username/projects/myproject/pkg0","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg0"}
 /user/username/projects/myproject/pkg1:
-  {"directoryName":"/user/username/projects/myproject/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg1"}
 /user/username/projects/myproject/pkg2:
-  {"directoryName":"/user/username/projects/myproject/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg2"}
 /user/username/projects/myproject/pkg3:
-  {"directoryName":"/user/username/projects/myproject/pkg3","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg3"}
 
 exitCode:: ExitStatus.undefined
 
@@ -385,11 +385,11 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/pkg0:
-  {"directoryName":"/user/username/projects/myproject/pkg0","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg0"}
 /user/username/projects/myproject/pkg1:
-  {"directoryName":"/user/username/projects/myproject/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg1"}
 /user/username/projects/myproject/pkg2:
-  {"directoryName":"/user/username/projects/myproject/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -491,11 +491,11 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/pkg0:
-  {"directoryName":"/user/username/projects/myproject/pkg0","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg0"}
 /user/username/projects/myproject/pkg1:
-  {"directoryName":"/user/username/projects/myproject/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg1"}
 /user/username/projects/myproject/pkg2:
-  {"directoryName":"/user/username/projects/myproject/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg2"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
index 86e8b55819ffe..28889c9a7580c 100644
--- a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
@@ -176,13 +176,13 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/pkg0:
-  {"directoryName":"/user/username/projects/myproject/pkg0","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg0"}
 /user/username/projects/myproject/pkg1:
-  {"directoryName":"/user/username/projects/myproject/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg1"}
 /user/username/projects/myproject/pkg2:
-  {"directoryName":"/user/username/projects/myproject/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg2"}
 /user/username/projects/myproject/pkg3:
-  {"directoryName":"/user/username/projects/myproject/pkg3","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg3"}
 
 exitCode:: ExitStatus.undefined
 
@@ -339,13 +339,13 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/pkg0:
-  {"directoryName":"/user/username/projects/myproject/pkg0","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg0"}
 /user/username/projects/myproject/pkg1:
-  {"directoryName":"/user/username/projects/myproject/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg1"}
 /user/username/projects/myproject/pkg2:
-  {"directoryName":"/user/username/projects/myproject/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg2"}
 /user/username/projects/myproject/pkg3:
-  {"directoryName":"/user/username/projects/myproject/pkg3","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg3"}
 
 exitCode:: ExitStatus.undefined
 
@@ -393,11 +393,11 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/pkg0:
-  {"directoryName":"/user/username/projects/myproject/pkg0","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg0"}
 /user/username/projects/myproject/pkg1:
-  {"directoryName":"/user/username/projects/myproject/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg1"}
 /user/username/projects/myproject/pkg2:
-  {"directoryName":"/user/username/projects/myproject/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -501,11 +501,11 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/pkg0:
-  {"directoryName":"/user/username/projects/myproject/pkg0","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg0"}
 /user/username/projects/myproject/pkg1:
-  {"directoryName":"/user/username/projects/myproject/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg1"}
 /user/username/projects/myproject/pkg2:
-  {"directoryName":"/user/username/projects/myproject/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/pkg2"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
index a4c8914f1a168..b2c561112eb81 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
@@ -55,7 +55,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
@@ -102,7 +102,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
index c70acece2e682..b096bac970057 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
@@ -54,7 +54,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
@@ -101,7 +101,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
index 0b854f3cd9685..102a3122368ca 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
@@ -50,14 +50,14 @@ WatchedFiles::
   {"fileName":"/home/username/project/app/file.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/home/username/project/node_modules/@types:
+  {"fileName":"/home/username/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/home/username/project/node_modules/@types:
-  {"directoryName":"/home/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /home/username/project/app:
-  {"directoryName":"/home/username/project/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/home/username/project/app"}
 
 exitCode:: ExitStatus.undefined
 
@@ -103,14 +103,14 @@ WatchedFiles::
   {"fileName":"/home/username/project/app/file.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/home/username/project/node_modules/@types:
+  {"fileName":"/home/username/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/home/username/project/node_modules/@types:
-  {"directoryName":"/home/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /home/username/project/app:
-  {"directoryName":"/home/username/project/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/home/username/project/app"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
index fa49643219b55..9567f0deb6e50 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
@@ -66,14 +66,14 @@ WatchedFiles::
   {"fileName":"/a/b/f3.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -146,14 +146,14 @@ WatchedFiles::
   {"fileName":"/a/b/f3.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -213,14 +213,14 @@ WatchedFiles::
   {"fileName":"/a/b/f3.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
index 33ce144476adb..18c5c07ceb7cc 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
@@ -87,14 +87,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -187,14 +187,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
index c6425f919362f..04f23c2aaa5a2 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
@@ -70,14 +70,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -175,14 +175,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
index d70d6c9479381..b5c71000f714a 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
@@ -82,14 +82,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -173,14 +173,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
index 97503f7dee9eb..f4707855b3345 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
@@ -82,14 +82,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -183,16 +183,16 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 /a/b/file1consumer3.ts:
   {"fileName":"/a/b/file1Consumer3.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
index 8856532f89c1a..f52931644bcbb 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
@@ -82,14 +82,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -178,14 +178,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -251,14 +251,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -320,14 +320,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -405,14 +405,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -478,14 +478,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
index dec1bc790c9f3..5e4bee56e5d58 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
@@ -82,14 +82,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -177,14 +177,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -252,14 +252,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js
index 8df4089a05941..1510b14313581 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-changes-in-non-root-files.js
@@ -67,12 +67,12 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -133,12 +133,12 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -191,12 +191,12 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
index 6f305f1e595fa..cdbce1ebf488b 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
@@ -63,14 +63,14 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /a/b/modulefile2.ts:
   {"fileName":"/a/b/modulefile2.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -136,14 +136,14 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /a/b/modulefile2.ts:
   {"fileName":"/a/b/modulefile2.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -205,16 +205,16 @@ WatchedFiles::
   {"fileName":"/a/b/referenceFile1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 /a/b/modulefile2.ts:
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
index e7dc8ea247bba..9f19ac324e202 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
@@ -64,14 +64,14 @@ WatchedFiles::
   {"fileName":"/a/b/referenceFile1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -136,16 +136,16 @@ WatchedFiles::
   {"fileName":"/a/b/referenceFile1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 /a/b/modulefile1.ts:
   {"fileName":"/a/b/modulefile1.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
index 650e11d0fce92..dcabd0690ecbc 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
@@ -82,14 +82,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -182,14 +182,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
index 39ed216478299..46553cf38b57d 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
@@ -90,14 +90,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -191,14 +191,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -265,14 +265,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -347,14 +347,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
index 4c824d524720b..7cd30bac07b7c 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
@@ -60,14 +60,14 @@ WatchedFiles::
   {"fileName":"/a/b/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -129,14 +129,14 @@ WatchedFiles::
   {"fileName":"/a/b/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
index 7e379c7c4ca7d..17fec0923ba94 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
@@ -58,14 +58,14 @@ WatchedFiles::
   {"fileName":"/a/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/node_modules/@types:
+  {"fileName":"/a/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/node_modules/@types:
-  {"directoryName":"/a/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -119,14 +119,14 @@ WatchedFiles::
   {"fileName":"/a/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/node_modules/@types:
+  {"fileName":"/a/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/node_modules/@types:
-  {"directoryName":"/a/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -177,14 +177,14 @@ WatchedFiles::
   {"fileName":"/a/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/node_modules/@types:
+  {"fileName":"/a/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/node_modules/@types:
-  {"directoryName":"/a/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
index a20e56f54036e..422ae9350d56d 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
@@ -52,14 +52,14 @@ WatchedFiles::
   {"fileName":"/a/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/node_modules/@types:
+  {"fileName":"/a/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/node_modules/@types:
-  {"directoryName":"/a/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -105,14 +105,14 @@ WatchedFiles::
   {"fileName":"/a/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/node_modules/@types:
+  {"fileName":"/a/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/node_modules/@types:
-  {"directoryName":"/a/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -158,14 +158,14 @@ WatchedFiles::
   {"fileName":"/a/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/node_modules/@types:
+  {"fileName":"/a/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/node_modules/@types:
-  {"directoryName":"/a/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
index 4ef872f02ce1e..dec712bb5bd5b 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
@@ -52,14 +52,14 @@ WatchedFiles::
   {"fileName":"/a/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/node_modules/@types:
+  {"fileName":"/a/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/node_modules/@types:
-  {"directoryName":"/a/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -105,14 +105,14 @@ WatchedFiles::
   {"fileName":"/a/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/node_modules/@types:
+  {"fileName":"/a/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/node_modules/@types:
-  {"directoryName":"/a/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -158,14 +158,14 @@ WatchedFiles::
   {"fileName":"/a/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/node_modules/@types:
+  {"fileName":"/a/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/node_modules/@types:
-  {"directoryName":"/a/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/with---outFile-and-multiple-declaration-files-in-the-program.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/with---outFile-and-multiple-declaration-files-in-the-program.js
index 8699baff9154b..4c567ed00e42f 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/with---outFile-and-multiple-declaration-files-in-the-program.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/with---outFile-and-multiple-declaration-files-in-the-program.js
@@ -69,12 +69,12 @@ WatchedFiles::
   {"fileName":"/a/b/project/src/main2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/project/node_modules/@types:
+  {"fileName":"/a/b/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/project/node_modules/@types:
-  {"directoryName":"/a/b/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js
index c5fd4854e9163..e412e7ba9c148 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/without---outFile-and-multiple-declaration-files-in-the-program.js
@@ -79,12 +79,12 @@ WatchedFiles::
   {"fileName":"/a/b/project/src/main2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/project/node_modules/@types:
+  {"fileName":"/a/b/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/project/node_modules/@types:
-  {"directoryName":"/a/b/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
index 0199008ca2079..59d6f8709809e 100644
--- a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
+++ b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
@@ -58,14 +58,14 @@ WatchedFiles::
   {"fileName":"/a/rootFolder/project/Scripts/TypeScript.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/rootfolder/project/node_modules/@types:
+  {"fileName":"/a/rootFolder/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/rootfolder/project/node_modules/@types:
-  {"directoryName":"/a/rootFolder/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/rootfolder/project/scripts:
-  {"directoryName":"/a/rootfolder/project/scripts","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/rootfolder/project/scripts"}
 
 exitCode:: ExitStatus.undefined
 
@@ -119,14 +119,14 @@ WatchedFiles::
   {"fileName":"/a/rootFolder/project/Scripts/TypeScript.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/rootfolder/project/node_modules/@types:
+  {"fileName":"/a/rootFolder/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/rootfolder/project/node_modules/@types:
-  {"directoryName":"/a/rootFolder/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/rootfolder/project/scripts:
-  {"directoryName":"/a/rootfolder/project/scripts","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/rootfolder/project/scripts"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
index 4ad08307699cb..588dd0314619b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
@@ -76,16 +76,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -144,16 +144,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -204,16 +204,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -264,16 +264,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
index e5af13740a6c7..3c4a303ac4d75 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
@@ -76,14 +76,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -176,14 +176,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -254,14 +254,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -331,14 +331,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 2e4300b3b2939..f6870d4839f63 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -117,14 +117,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -231,14 +231,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -304,14 +304,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -374,14 +374,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
index 668de3197073d..50725d10919ea 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
@@ -105,12 +105,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -280,12 +280,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -356,12 +356,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -428,12 +428,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
index c6e0b42637201..a973293ab31bb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
@@ -116,12 +116,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -308,12 +308,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -388,12 +388,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -463,12 +463,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index 10cfb6a2a9db9..c196a15f8e053 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -209,14 +209,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -265,14 +265,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -401,14 +401,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -531,14 +531,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -585,14 +585,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -698,14 +698,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index 4aff6d522fa99..9f422d51110de 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -133,14 +133,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -189,14 +189,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -267,14 +267,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -321,14 +321,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -375,14 +375,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -430,14 +430,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 3bfc8798173ab..79e6631c3f518 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -76,16 +76,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -148,16 +148,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -208,16 +208,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -268,16 +268,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
index 1b5b6508729ef..373706d52b51b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -76,14 +76,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -186,14 +186,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -265,14 +265,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -344,14 +344,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 261571ca33d61..a56820f7ba866 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -117,14 +117,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -271,14 +271,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -369,14 +369,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -467,14 +467,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
index 3606da8908821..9c8cb4ce05414 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
@@ -105,12 +105,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -297,12 +297,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -370,12 +370,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -443,12 +443,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
index 1b1c6a5f0fadf..c2029539d86b6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
@@ -116,12 +116,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -332,12 +332,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -408,12 +408,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -484,12 +484,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index ba89be276eac7..62a39e94657d7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -210,14 +210,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -266,14 +266,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -417,14 +417,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -548,14 +548,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -602,14 +602,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -717,14 +717,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index a858fd1aff63c..4b11546874572 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -133,14 +133,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -189,14 +189,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -281,14 +281,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -335,14 +335,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -389,14 +389,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -445,14 +445,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
index c29f5601d0aa2..631343058a2df 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
@@ -76,16 +76,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -151,16 +151,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -213,16 +213,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -280,16 +280,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
index ad28da438703c..ef905fec9f71d 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
@@ -76,14 +76,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -176,14 +176,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -251,14 +251,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -330,14 +330,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 6511d769013c2..ab0c14cc99bcc 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -117,14 +117,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -231,14 +231,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -324,14 +324,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -400,14 +400,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js
index 12f34fb44e190..2e3b76320f3b6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/no-circular-import/export.js
@@ -105,12 +105,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -280,12 +280,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -358,12 +358,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -438,12 +438,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js
index f635f3ae38bf0..831148b964ab3 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/transitive-exports/yes-circular-import/exports.js
@@ -116,12 +116,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -308,12 +308,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -392,12 +392,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -477,12 +477,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
index d01d060fe1319..1815f1161294c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
@@ -85,14 +85,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -214,14 +214,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -270,14 +270,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -405,14 +405,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -534,14 +534,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -588,14 +588,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -700,14 +700,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
index bd644b773bad1..193e714134443 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
@@ -85,14 +85,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -139,14 +139,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -195,14 +195,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -273,14 +273,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -327,14 +327,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -381,14 +381,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -436,14 +436,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
index 881bb3fb80725..699571df19343 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -76,16 +76,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -155,16 +155,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -218,16 +218,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -286,16 +286,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
index 461b77f5037bb..1c4a21d2285bb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
@@ -76,14 +76,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -193,14 +193,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -275,14 +275,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -362,14 +362,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 80810ab0ec43a..c21f835e5b510 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -117,14 +117,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -259,14 +259,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -363,14 +363,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -451,14 +451,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js
index 3daa1e66f2f5d..c9ad14dc36d26 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/no-circular-import/export.js
@@ -105,12 +105,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -311,12 +311,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -396,12 +396,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -487,12 +487,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js
index d90b5e2271ced..d225839efea92 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/transitive-exports/yes-circular-import/exports.js
@@ -116,12 +116,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -348,12 +348,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -439,12 +439,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -536,12 +536,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
index a7e1626c8dc86..fb6d7def3696b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -209,14 +209,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -265,14 +265,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -415,14 +415,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -545,14 +545,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -599,14 +599,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -713,14 +713,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
index efbd1eccf804c..5413dd85b98da 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -133,14 +133,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -189,14 +189,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -281,14 +281,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -335,14 +335,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -389,14 +389,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -445,14 +445,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
index 0a08936aad5a3..66f60506f1f5a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
@@ -76,16 +76,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -213,16 +213,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -342,16 +342,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -471,16 +471,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
index a02c355ad5092..1dd6ac58db846 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
@@ -76,14 +76,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -245,14 +245,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -401,14 +401,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -556,14 +556,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
index d0ef2c17b099d..1bcca5eaac7e8 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -117,14 +117,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -375,14 +375,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -544,14 +544,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -710,14 +710,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
index 079a29e8103f8..0b4041640a8ac 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/no-circular-import/export.js
@@ -105,12 +105,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -394,12 +394,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -604,12 +604,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -810,12 +810,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
index b6640524b36d7..8deb60b48702e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/transitive-exports/yes-circular-import/exports.js
@@ -116,12 +116,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -437,12 +437,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -666,12 +666,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -890,12 +890,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index e42e43bd8b646..6a2fb7c3ca2de 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -209,14 +209,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -265,14 +265,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -401,14 +401,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -531,14 +531,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -585,14 +585,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -698,14 +698,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index 9dde0054674ce..e27fa9ebfe9ec 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -209,14 +209,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -265,14 +265,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -401,14 +401,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -531,14 +531,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -585,14 +585,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -698,14 +698,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 59e9152a272f4..df8601c2f13a0 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -76,16 +76,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -215,16 +215,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -342,16 +342,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -469,16 +469,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
index 34d7a6f01d14b..3416312008eda 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -76,14 +76,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -253,14 +253,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -399,14 +399,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -545,14 +545,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 684bae78c879c..ba092a2792a08 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -117,14 +117,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -413,14 +413,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -653,14 +653,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -893,14 +893,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
index 21eff29fc5920..0381bd1399308 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/no-circular-import/export.js
@@ -105,12 +105,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -409,12 +409,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -594,12 +594,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -779,12 +779,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
index a0b4491f09040..6f631b3f9d48d 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/transitive-exports/yes-circular-import/exports.js
@@ -116,12 +116,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -459,12 +459,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -662,12 +662,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -865,12 +865,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index bfdf6d81126b5..3150fc9f07abe 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -210,14 +210,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -266,14 +266,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -417,14 +417,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -548,14 +548,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -602,14 +602,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -717,14 +717,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index 3f2c70b67c6d6..a414dbec0e233 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -210,14 +210,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -266,14 +266,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -417,14 +417,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -548,14 +548,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -602,14 +602,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -717,14 +717,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
index fc05264b9f6be..4b76ba3f74523 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
@@ -76,16 +76,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -217,16 +217,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -357,16 +357,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -490,16 +490,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
index 1ddc36f38bc2a..6b6265e4062da 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
@@ -76,14 +76,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -242,14 +242,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -392,14 +392,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -537,14 +537,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
index ba0c15f8df4a8..0bd997cf7d85b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -117,14 +117,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -372,14 +372,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -558,14 +558,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -775,14 +775,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/no-circular-import/export.js
index 33455df772015..9165ed0350619 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/no-circular-import/export.js
@@ -105,12 +105,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -391,12 +391,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -600,12 +600,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -791,12 +791,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/yes-circular-import/exports.js
index f72cf752238d1..44461f949bbe3 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/transitive-exports/yes-circular-import/exports.js
@@ -116,12 +116,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -434,12 +434,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -664,12 +664,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -875,12 +875,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
index 050317bc3b808..4e54ef89ac83f 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
@@ -85,14 +85,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -214,14 +214,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -270,14 +270,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -405,14 +405,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -534,14 +534,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -588,14 +588,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -700,14 +700,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
index ab3c4d7927f42..066a8ed1b5250 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
@@ -85,14 +85,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -214,14 +214,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -270,14 +270,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -405,14 +405,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -534,14 +534,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -588,14 +588,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -700,14 +700,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
index c440413b8f56a..a8dc692ec8683 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -76,16 +76,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -221,16 +221,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -362,16 +362,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -496,16 +496,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
index e9cf233438753..da962daca7abb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
@@ -76,14 +76,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -259,14 +259,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -419,14 +419,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -572,14 +572,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 081531da6d496..932f6e6d7b252 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -117,14 +117,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -400,14 +400,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -600,14 +600,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -829,14 +829,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/no-circular-import/export.js
index 3553ec1da0723..22beee191fc06 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/no-circular-import/export.js
@@ -105,12 +105,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -422,12 +422,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -641,12 +641,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -843,12 +843,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/yes-circular-import/exports.js
index 8e8b28d62f71b..215155f5498f7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/transitive-exports/yes-circular-import/exports.js
@@ -116,12 +116,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -474,12 +474,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -714,12 +714,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -937,12 +937,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
index 036a97dadd0e4..601b2bf7df52d 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -209,14 +209,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -265,14 +265,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -415,14 +415,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -545,14 +545,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -599,14 +599,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -713,14 +713,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
index 35a4b1f80423d..04da9585b4462 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -209,14 +209,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -265,14 +265,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -415,14 +415,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -545,14 +545,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -599,14 +599,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -713,14 +713,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
index ae960b54f62fa..2fcab61a09b4e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
@@ -76,16 +76,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -217,16 +217,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -357,16 +357,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -490,16 +490,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
index 13f79b0d72f36..26cd3ba63c1ae 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
@@ -76,14 +76,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -242,14 +242,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -393,14 +393,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -537,14 +537,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 53ebb855fc8d2..1ce4cd7ddf0e6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -117,14 +117,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -372,14 +372,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -559,14 +559,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -775,14 +775,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/no-circular-import/export.js
index 9f576d8cb82f3..866e61ca77b6d 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/no-circular-import/export.js
@@ -105,12 +105,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -391,12 +391,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -598,12 +598,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -788,12 +788,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/yes-circular-import/exports.js
index 3cc11bccabbb9..134ccd471bc0f 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/transitive-exports/yes-circular-import/exports.js
@@ -116,12 +116,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -434,12 +434,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -661,12 +661,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -871,12 +871,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
index 7df8484e45904..227a723d9db08 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -208,14 +208,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -264,14 +264,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -399,14 +399,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -528,14 +528,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -582,14 +582,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -694,14 +694,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
index ecd40437efddc..ded4c8efa0ef5 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -208,14 +208,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -264,14 +264,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -399,14 +399,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -528,14 +528,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -582,14 +582,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -694,14 +694,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
index eac80ea725366..acd5004cc0b66 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -76,16 +76,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -221,16 +221,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -362,16 +362,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -496,16 +496,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
index e611a650ee126..b15e1527acddc 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -76,14 +76,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -259,14 +259,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -418,14 +418,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -570,14 +570,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index ae50ce1ec816a..b635367da4bad 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -117,14 +117,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -402,14 +402,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -604,14 +604,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -835,14 +835,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
index ab19e60075cee..d074d8f259f1e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
@@ -105,12 +105,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -422,12 +422,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -640,12 +640,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -841,12 +841,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
index 65720509b7e27..b43f63dd5712f 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
@@ -116,12 +116,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -474,12 +474,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -713,12 +713,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -935,12 +935,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index b320338ade2cd..21b1931997a15 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -209,14 +209,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -265,14 +265,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -415,14 +415,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -545,14 +545,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -599,14 +599,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -713,14 +713,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
index e4a2935993f12..dd4860a139214 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -209,14 +209,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -265,14 +265,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -415,14 +415,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -545,14 +545,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -599,14 +599,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -713,14 +713,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
index f82cb18acc206..e10259bdb7999 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
@@ -76,16 +76,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -151,16 +151,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -213,16 +213,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -280,16 +280,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
index 187c852e65829..77efd91c3c423 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
@@ -76,14 +76,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -176,14 +176,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -249,14 +249,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -327,14 +327,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
index bdf52477a2dec..40a113914a8b5 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -117,14 +117,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -231,14 +231,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -322,14 +322,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -397,14 +397,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js
index 666c696b59ce8..00ac51873b0fc 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/no-circular-import/export.js
@@ -105,12 +105,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -280,12 +280,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -353,12 +353,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -432,12 +432,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js
index 64a6121a827be..74627b40740bb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/transitive-exports/yes-circular-import/exports.js
@@ -116,12 +116,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -308,12 +308,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -386,12 +386,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -470,12 +470,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
index b6855669b1717..929a0d47ef92a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -208,14 +208,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -264,14 +264,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -399,14 +399,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -528,14 +528,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -582,14 +582,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -694,14 +694,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
index eeeb35625e47a..8a6457efb098a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -133,14 +133,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -189,14 +189,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -267,14 +267,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -321,14 +321,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -375,14 +375,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -430,14 +430,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 07ddff950d931..618fe53144a13 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -76,16 +76,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -155,16 +155,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -218,16 +218,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -286,16 +286,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
index 68a41566c5e8d..dd21b663f9d48 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -76,14 +76,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -193,14 +193,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -274,14 +274,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -360,14 +360,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/c.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 54fdd1b5eba79..08665de0850ed 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -117,14 +117,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -261,14 +261,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -367,14 +367,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -457,14 +457,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/e.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
index 91452c7142d6f..f0984d96bbef4 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/no-circular-import/export.js
@@ -105,12 +105,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -311,12 +311,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -395,12 +395,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -485,12 +485,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib1/tools/tools.interface.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
index 058f6fe2036ea..881aa01242d2c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/transitive-exports/yes-circular-import/exports.js
@@ -116,12 +116,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -348,12 +348,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -438,12 +438,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -534,12 +534,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib2/data2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index 83a5707d25137..b4d48baa2da55 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -209,14 +209,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -265,14 +265,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -415,14 +415,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -545,14 +545,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -599,14 +599,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -713,14 +713,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
index e95bfc9ace12c..61aaa51244d05 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
@@ -79,14 +79,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -133,14 +133,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -189,14 +189,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -281,14 +281,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -335,14 +335,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -389,14 +389,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
@@ -445,14 +445,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/noEmitOnError/src/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/noemitonerror/node_modules/@types:
+  {"fileName":"/user/username/projects/noEmitOnError/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/noemitonerror/node_modules/@types:
-  {"directoryName":"/user/username/projects/noEmitOnError/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/noemitonerror:
-  {"directoryName":"/user/username/projects/noemitonerror","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/noemitonerror"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/jsxImportSource-option-changed.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/jsxImportSource-option-changed.js
index b1d511faa2c44..7d5a35d4ea3b4 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/jsxImportSource-option-changed.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/jsxImportSource-option-changed.js
@@ -90,14 +90,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/node_modules/react/jsx-runtime/package.json","pollingInterval":250}
 /user/username/projects/myproject/node_modules/react/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/react/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
index 33e472c837816..e456a1c479dc5 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
@@ -74,14 +74,14 @@ c:/project/b.ts:
   {"fileName":"c:/project/b.ts","pollingInterval":250}
 c:/a/lib/lib.d.ts:
   {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+c:/project/node_modules/@types:
+  {"fileName":"c:/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-c:/project/node_modules/@types:
-  {"directoryName":"c:/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 c:/project:
-  {"directoryName":"c:/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"c:/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -155,14 +155,14 @@ c:/project/b.ts:
   {"fileName":"c:/project/b.ts","pollingInterval":250}
 c:/a/lib/lib.d.ts:
   {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+c:/project/node_modules/@types:
+  {"fileName":"c:/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-c:/project/node_modules/@types:
-  {"directoryName":"c:/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 c:/project:
-  {"directoryName":"c:/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"c:/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
index e8961da542b86..0f6c41da797e6 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
@@ -74,14 +74,14 @@ c:/project/b.ts:
   {"fileName":"C:/project/b.ts","pollingInterval":250}
 c:/a/lib/lib.d.ts:
   {"fileName":"C:/a/lib/lib.d.ts","pollingInterval":250}
+c:/project/node_modules/@types:
+  {"fileName":"C:/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-c:/project/node_modules/@types:
-  {"directoryName":"C:/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 c:/project:
-  {"directoryName":"c:/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"c:/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -155,14 +155,14 @@ c:/project/b.ts:
   {"fileName":"C:/project/b.ts","pollingInterval":250}
 c:/a/lib/lib.d.ts:
   {"fileName":"C:/a/lib/lib.d.ts","pollingInterval":250}
+c:/project/node_modules/@types:
+  {"fileName":"C:/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-c:/project/node_modules/@types:
-  {"directoryName":"C:/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 c:/project:
-  {"directoryName":"c:/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"c:/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
index 634c9ca43fadb..64c8750238936 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
@@ -73,14 +73,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -183,14 +183,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
index 53467069a4612..9988e442d3229 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
@@ -82,14 +82,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -176,14 +176,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
index 6f765544f578c..456cccb88e79c 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
@@ -58,14 +58,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/logger.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -135,14 +135,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/logger.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
index b847f8fdb410d..29142ac77caa3 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
@@ -73,14 +73,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -183,14 +183,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
index 094ce2ca94265..e8a12f2296868 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
@@ -82,14 +82,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -176,14 +176,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
index c9f4403e401f2..b1f10b3b0e2a4 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
@@ -71,22 +71,22 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/tsconfig.json","pollingInterval":250}
 /user/username/projects/myproject/b.ts:
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
+/user/username/projects/myproject/yx:
+  {"fileName":"/user/username/projects/myproject/yX","pollingInterval":500}
 /user/username/projects/myproject/link/a.ts:
   {"fileName":"/user/username/projects/myproject/link/a.ts","pollingInterval":250}
 /user/username/projects/myproject/xy/a.ts:
   {"fileName":"/user/username/projects/myproject/XY/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/yx:
-  {"directoryName":"/user/username/projects/myproject/yX","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -187,22 +187,22 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/tsconfig.json","pollingInterval":250}
 /user/username/projects/myproject/b.ts:
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
+/user/username/projects/myproject/yx:
+  {"fileName":"/user/username/projects/myproject/yX","pollingInterval":500}
 /user/username/projects/myproject/link/a.ts:
   {"fileName":"/user/username/projects/myproject/link/a.ts","pollingInterval":250}
 /user/username/projects/myproject/xy/a.ts:
   {"fileName":"/user/username/projects/myproject/XY/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/yx:
-  {"directoryName":"/user/username/projects/myproject/yX","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
index 39c9167334e37..0204fc9578439 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
@@ -82,22 +82,22 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/XY.ts","pollingInterval":250}
 /user/username/projects/myproject/b.ts:
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
+/user/username/projects/myproject/yx:
+  {"fileName":"/user/username/projects/myproject/yX","pollingInterval":500}
 /user/username/projects/myproject/link.ts:
   {"fileName":"/user/username/projects/myproject/link.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/yx:
-  {"directoryName":"/user/username/projects/myproject/yX","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -182,22 +182,22 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/XY.ts","pollingInterval":250}
 /user/username/projects/myproject/b.ts:
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
+/user/username/projects/myproject/yx:
+  {"fileName":"/user/username/projects/myproject/yX","pollingInterval":500}
 /user/username/projects/myproject/link.ts:
   {"fileName":"/user/username/projects/myproject/link.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/yx:
-  {"directoryName":"/user/username/projects/myproject/yX","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
index a3571bb39360c..2e22902f7e87d 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
@@ -81,14 +81,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -199,14 +199,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
index f0059e68a8b7b..4dfcc38d2850a 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
@@ -90,14 +90,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -192,14 +192,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
index effb28f973961..d2bf74dbd4b82 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
@@ -81,14 +81,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -199,14 +199,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
index 23c67c71ac06b..6803d520bc981 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
@@ -90,14 +90,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -192,14 +192,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/link.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
index 481cc141c2a56..9b85779d75796 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
@@ -104,14 +104,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/moduleB.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -213,14 +213,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/moduleB.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
index de81b0d9b7e94..396d57d3b2756 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
@@ -58,14 +58,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/logger.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -131,14 +131,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/logger.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
index 14d6f7c11844c..f97d3a05fb12e 100644
--- a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
@@ -70,18 +70,18 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /users/username/projects/project/node_modules/classnames/package.json:
   {"fileName":"/users/username/projects/project/node_modules/classnames/package.json","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /users/username/projects/project/src:
-  {"directoryName":"/users/username/projects/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project/src"}
 /users/username/projects/project/node_modules:
-  {"directoryName":"/users/username/projects/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project/node_modules"}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -215,18 +215,18 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /users/username/projects/project/node_modules/classnames/package.json:
   {"fileName":"/users/username/projects/project/node_modules/classnames/package.json","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /users/username/projects/project/src:
-  {"directoryName":"/users/username/projects/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project/src"}
 /users/username/projects/project/node_modules:
-  {"directoryName":"/users/username/projects/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project/node_modules"}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js b/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
index 013f8e9db8614..d68dbff30cf5e 100644
--- a/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
@@ -65,16 +65,16 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /users/username/projects/project/node_modules/tslib/package.json:
   {"fileName":"/users/username/projects/project/node_modules/tslib/package.json","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /users/username/projects/project/node_modules:
-  {"directoryName":"/users/username/projects/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project/node_modules"}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -130,16 +130,16 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /users/username/projects/project/node_modules/tslib/package.json:
   {"fileName":"/users/username/projects/project/node_modules/tslib/package.json","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /users/username/projects/project/node_modules:
-  {"directoryName":"/users/username/projects/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project/node_modules"}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/incremental-with-circular-references-watch.js b/tests/baselines/reference/tscWatch/incremental/incremental-with-circular-references-watch.js
index 9dfa11ed63a19..29c0bd96687d5 100644
--- a/tests/baselines/reference/tscWatch/incremental/incremental-with-circular-references-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/incremental-with-circular-references-watch.js
@@ -89,14 +89,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/index.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -285,14 +285,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/index.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-added-watch.js b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-added-watch.js
index e45b207c97124..674753987f338 100644
--- a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-added-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-added-watch.js
@@ -57,16 +57,16 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/index.tsx","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules:
+  {"fileName":"/users/username/projects/project/node_modules","pollingInterval":500}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules:
-  {"directoryName":"/users/username/projects/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -187,16 +187,16 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/node_modules/react/jsx-runtime/package.json","pollingInterval":250}
 /users/username/projects/project/node_modules/react/package.json:
   {"fileName":"/users/username/projects/project/node_modules/react/package.json","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /users/username/projects/project/node_modules:
-  {"directoryName":"/users/username/projects/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project/node_modules"}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-removed-watch.js b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-removed-watch.js
index cd0d1e7b8b18d..0d6313c757af6 100644
--- a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-removed-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-backing-types-removed-watch.js
@@ -78,16 +78,16 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/node_modules/react/jsx-runtime/package.json","pollingInterval":250}
 /users/username/projects/project/node_modules/react/package.json:
   {"fileName":"/users/username/projects/project/node_modules/react/package.json","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /users/username/projects/project/node_modules:
-  {"directoryName":"/users/username/projects/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project/node_modules"}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -200,16 +200,16 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/node_modules/react/jsx-runtime/package.json","pollingInterval":250}
 /users/username/projects/project/node_modules/react/package.json:
   {"fileName":"/users/username/projects/project/node_modules/react/package.json","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /users/username/projects/project/node_modules:
-  {"directoryName":"/users/username/projects/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project/node_modules"}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-option-changed-watch.js b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-option-changed-watch.js
index 7725b4acdace9..43c965a24eefb 100644
--- a/tests/baselines/reference/tscWatch/incremental/jsxImportSource-option-changed-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/jsxImportSource-option-changed-watch.js
@@ -101,16 +101,16 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/node_modules/react/jsx-runtime/package.json","pollingInterval":250}
 /users/username/projects/project/node_modules/react/package.json:
   {"fileName":"/users/username/projects/project/node_modules/react/package.json","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /users/username/projects/project/node_modules:
-  {"directoryName":"/users/username/projects/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project/node_modules"}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -237,16 +237,16 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/node_modules/preact/jsx-runtime/package.json","pollingInterval":250}
 /users/username/projects/project/node_modules/preact/package.json:
   {"fileName":"/users/username/projects/project/node_modules/preact/package.json","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /users/username/projects/project/node_modules:
-  {"directoryName":"/users/username/projects/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project/node_modules"}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-watch.js b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-watch.js
index 2e79391f863c7..98fbfba2417b4 100644
--- a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-with-errors-watch.js
@@ -63,14 +63,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -189,14 +189,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-watch.js b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-watch.js
index 68cba3cbea504..49f113c239af3 100644
--- a/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/module-compilation/own-file-emit-without-errors-watch.js
@@ -58,14 +58,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -167,14 +167,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/module-compilation/with---out-watch.js b/tests/baselines/reference/tscWatch/incremental/module-compilation/with---out-watch.js
index 4ed569a14ce0f..e090cf6808496 100644
--- a/tests/baselines/reference/tscWatch/incremental/module-compilation/with---out-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/module-compilation/with---out-watch.js
@@ -52,14 +52,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/own-file-emit-with-errors-watch.js b/tests/baselines/reference/tscWatch/incremental/own-file-emit-with-errors-watch.js
index 0bb59d7451bd4..1810c4ac704bc 100644
--- a/tests/baselines/reference/tscWatch/incremental/own-file-emit-with-errors-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/own-file-emit-with-errors-watch.js
@@ -63,14 +63,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -181,14 +181,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/with-commandline-parameters-that-are-not-relative-watch.js b/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/with-commandline-parameters-that-are-not-relative-watch.js
index 80549bfa4b8ed..cbe9d285d1f37 100644
--- a/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/with-commandline-parameters-that-are-not-relative-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/with-commandline-parameters-that-are-not-relative-watch.js
@@ -58,14 +58,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -159,14 +159,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/without-commandline-options-watch.js b/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/without-commandline-options-watch.js
index fa1e250c159cc..de1553bf81979 100644
--- a/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/without-commandline-options-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/own-file-emit-without-errors/without-commandline-options-watch.js
@@ -58,14 +58,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -159,14 +159,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/when-file-with-ambient-global-declaration-file-is-deleted-watch.js b/tests/baselines/reference/tscWatch/incremental/when-file-with-ambient-global-declaration-file-is-deleted-watch.js
index 2ff03fa62b66a..0cc2dee3a0876 100644
--- a/tests/baselines/reference/tscWatch/incremental/when-file-with-ambient-global-declaration-file-is-deleted-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/when-file-with-ambient-global-declaration-file-is-deleted-watch.js
@@ -60,14 +60,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/index.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -155,14 +155,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/index.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/incremental/with---out-watch.js b/tests/baselines/reference/tscWatch/incremental/with---out-watch.js
index dad99f4f478d1..050f538e4c107 100644
--- a/tests/baselines/reference/tscWatch/incremental/with---out-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/with---out-watch.js
@@ -52,14 +52,14 @@ WatchedFiles::
   {"fileName":"/users/username/projects/project/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/users/username/projects/project/node_modules/@types:
+  {"fileName":"/users/username/projects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/users/username/projects/project/node_modules/@types:
-  {"directoryName":"/users/username/projects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /users/username/projects/project:
-  {"directoryName":"/users/username/projects/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/users/username/projects/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
index 38a03f26ac618..8ab4f71d85f61 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
@@ -112,28 +112,28 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/pkg2/build/const.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/pkg1/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/pkg1/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/pkg2/package.json:
   {"fileName":"/user/username/projects/myproject/packages/pkg2/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/pkg1/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/pkg1/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/pkg2:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/pkg1/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg2"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/pkg1/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/packages/pkg1:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg1"}
 
 exitCode:: ExitStatus.undefined
 
@@ -216,24 +216,24 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/pkg2/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/pkg2/build/other.d.ts:
   {"fileName":"/user/username/projects/myproject/packages/pkg2/build/other.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/pkg1/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/pkg1/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/pkg1/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/pkg1/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/pkg1:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/pkg1/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg1"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/pkg1/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
@@ -321,26 +321,26 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/pkg2/build/index.d.ts","pollingInterval":250}
 /user/username/projects/myproject/packages/pkg2/build/const.d.ts:
   {"fileName":"/user/username/projects/myproject/packages/pkg2/build/const.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/pkg1/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/pkg1/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/pkg1/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/pkg1/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/pkg1:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg1"}
 /user/username/projects/myproject/packages/pkg2:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/pkg1/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/pkg2"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/pkg1/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/pkg1/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js
index bad3c2f405f98..5ec25f7fcfe83 100644
--- a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
+++ b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
@@ -73,14 +73,14 @@ WatchedFiles::
   {"fileName":"/a/package.json","pollingInterval":250}
 /package.json:
   {"fileName":"/package.json","pollingInterval":250}
+/project/node_modules/@types:
+  {"fileName":"/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/project/node_modules/@types:
-  {"directoryName":"/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /project:
-  {"directoryName":"/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -133,14 +133,14 @@ WatchedFiles::
   {"fileName":"/project/src/package.json","pollingInterval":250}
 /project/package.json:
   {"fileName":"/project/package.json","pollingInterval":250}
+/project/node_modules/@types:
+  {"fileName":"/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/project/node_modules/@types:
-  {"directoryName":"/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /project:
-  {"directoryName":"/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Configure-file-diagnostics-events-are-generated-when-the-config-file-has-errors.js b/tests/baselines/reference/tscWatch/programUpdates/Configure-file-diagnostics-events-are-generated-when-the-config-file-has-errors.js
index 49927e202caad..d1e4417238d8d 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Configure-file-diagnostics-events-are-generated-when-the-config-file-has-errors.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Configure-file-diagnostics-events-are-generated-when-the-config-file-has-errors.js
@@ -65,14 +65,14 @@ WatchedFiles::
   {"fileName":"/a/b/app.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
index 8b8222669058e..15a3e8bd3fa82 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
@@ -71,14 +71,14 @@ WatchedFiles::
   {"fileName":"/a/b/app.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -141,14 +141,14 @@ WatchedFiles::
   {"fileName":"/a/b/app.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Proper-errors-document-is-not-contained-in-project.js b/tests/baselines/reference/tscWatch/programUpdates/Proper-errors-document-is-not-contained-in-project.js
index 2cd209a3fd767..f479de950bcce 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Proper-errors-document-is-not-contained-in-project.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Proper-errors-document-is-not-contained-in-project.js
@@ -60,14 +60,14 @@ WatchedFiles::
   {"fileName":"/a/b/app.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
index 3f1f97f6c4719..65462ae84baab 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
@@ -50,14 +50,14 @@ WatchedFiles::
   {"fileName":"/a/b/app.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -108,14 +108,14 @@ WatchedFiles::
   {"fileName":"/a/b/app.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -156,14 +156,14 @@ WatchedFiles::
   {"fileName":"/a/b/app.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
index a06197c668323..4f47cd5f54f3c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
@@ -55,7 +55,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
@@ -109,7 +109,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
@@ -154,7 +154,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
index 4c5f9fd874543..22d57ffd06393 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
@@ -50,14 +50,14 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -105,16 +105,16 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 /a/b/commonfile2.ts:
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
index dbcedcb926755..9be0097c5bedf 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
@@ -55,7 +55,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js
index 198407636764c..2e7f67fdcec40 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-in-list-of-files).js
@@ -53,12 +53,12 @@ WatchedFiles::
   {"fileName":"/a/b/f1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -106,14 +106,14 @@ WatchedFiles::
   {"fileName":"/a/b/f1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 /a/b/f2.ts:
   {"fileName":"/a/b/f2.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
index bdc830d204aef..4ef78e41a9881 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
@@ -50,14 +50,14 @@ WatchedFiles::
   {"fileName":"/a/b/f1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -105,16 +105,16 @@ WatchedFiles::
   {"fileName":"/a/b/f1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 /a/b/f2.ts:
   {"fileName":"/a/b/f2.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
index 4d67e95eb4725..48b958db8510f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
@@ -50,16 +50,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/Project/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/project/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/Project/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/project/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/Project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject/project:
-  {"directoryName":"/user/username/projects/myproject/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -107,18 +107,18 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/Project/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/project/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/Project/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/project/file2.ts:
   {"fileName":"/user/username/projects/myproject/Project/file2.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/project/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/Project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject/project:
-  {"directoryName":"/user/username/projects/myproject/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-handle-tsconfig-file-name-with-difference-casing.js b/tests/baselines/reference/tscWatch/programUpdates/can-handle-tsconfig-file-name-with-difference-casing.js
index 0f5f85ff676ef..c9d771a21a328 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-handle-tsconfig-file-name-with-difference-casing.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-handle-tsconfig-file-name-with-difference-casing.js
@@ -50,12 +50,12 @@ WatchedFiles::
   {"fileName":"/A/B/app.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/A/B/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/A/B/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js b/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js
index 266ea82a68489..24c9dc715570f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-update-configured-project-when-set-of-root-files-was-not-changed.js
@@ -58,12 +58,12 @@ WatchedFiles::
   {"fileName":"/a/b/f2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -112,12 +112,12 @@ WatchedFiles::
   {"fileName":"/a/b/f2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
index 5e03660aaa3c6..1d1e3a97eda54 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
@@ -51,14 +51,14 @@ WatchedFiles::
   {"fileName":"/a/b/f1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -110,14 +110,14 @@ WatchedFiles::
   {"fileName":"/a/b/f1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/config-file-includes-the-file.js b/tests/baselines/reference/tscWatch/programUpdates/config-file-includes-the-file.js
index 81afaa8af30a4..bc7172787e81b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/config-file-includes-the-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/config-file-includes-the-file.js
@@ -66,12 +66,12 @@ WatchedFiles::
   {"fileName":"/a/c/f3.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/c/node_modules/@types:
+  {"fileName":"/a/c/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/c/node_modules/@types:
-  {"directoryName":"/a/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js b/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
index 1a995e90899aa..8ce89bda343d1 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
@@ -58,14 +58,14 @@ WatchedFiles::
   {"fileName":"/a/b/f2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -97,14 +97,14 @@ WatchedFiles::
   {"fileName":"/a/b/f2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.DiagnosticsPresent_OutputsSkipped
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
index 09159656db710..c5b9c128afc0b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
@@ -59,14 +59,14 @@ WatchedFiles::
   {"fileName":"/src/app.ts","pollingInterval":250}
 /compiler/lib.es5.d.ts:
   {"fileName":"/compiler/lib.es5.d.ts","pollingInterval":250}
+/src/node_modules/@types:
+  {"fileName":"/src/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/src/node_modules/@types:
-  {"directoryName":"/src/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /src:
-  {"directoryName":"/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/src"}
 
 exitCode:: ExitStatus.undefined
 
@@ -114,16 +114,16 @@ WatchedFiles::
   {"fileName":"/src/app.ts","pollingInterval":250}
 /compiler/lib.es5.d.ts:
   {"fileName":"/compiler/lib.es5.d.ts","pollingInterval":250}
+/src/node_modules/@types:
+  {"fileName":"/src/node_modules/@types","pollingInterval":500}
 /compiler/lib.es2015.promise.d.ts:
   {"fileName":"/compiler/lib.es2015.promise.d.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/src/node_modules/@types:
-  {"directoryName":"/src/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /src:
-  {"directoryName":"/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/src"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/create-configured-project-without-file-list.js b/tests/baselines/reference/tscWatch/programUpdates/create-configured-project-without-file-list.js
index 33ed2f53acdee..080b8440f40d9 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/create-configured-project-without-file-list.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/create-configured-project-without-file-list.js
@@ -67,14 +67,14 @@ WatchedFiles::
   {"fileName":"/a/b/d/f2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
index cb7dcd8725350..c24a8fc88e321 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
@@ -71,7 +71,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
index 5e5a7b6f05dff..a10797617e9a4 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
@@ -160,7 +160,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
index 1252177b6b9b9..233d8635a3ebe 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
@@ -157,7 +157,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js b/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js
index efaad4632b2de..8396b358c1a42 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/extended-source-files-are-watched.js
@@ -64,12 +64,12 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -121,6 +121,8 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 /a/b/second.tsconfig.json:
   {"fileName":"/a/b/second.tsconfig.json","pollingInterval":250}
 /a/b/first.tsconfig.json:
@@ -129,8 +131,6 @@ WatchedFiles::
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -174,6 +174,8 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 /a/b/second.tsconfig.json:
   {"fileName":"/a/b/second.tsconfig.json","pollingInterval":250}
 /a/b/first.tsconfig.json:
@@ -182,8 +184,6 @@ WatchedFiles::
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -227,6 +227,8 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 /a/b/second.tsconfig.json:
   {"fileName":"/a/b/second.tsconfig.json","pollingInterval":250}
 /a/b/first.tsconfig.json:
@@ -235,8 +237,6 @@ WatchedFiles::
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -280,12 +280,12 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/file-in-files-is-deleted.js b/tests/baselines/reference/tscWatch/programUpdates/file-in-files-is-deleted.js
index 67b8d85e3d235..57d7c816fcea1 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/file-in-files-is-deleted.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/file-in-files-is-deleted.js
@@ -58,12 +58,12 @@ WatchedFiles::
   {"fileName":"/a/b/f2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -117,14 +117,14 @@ WatchedFiles::
   {"fileName":"/a/b/f1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 /a/b/f2.ts:
   {"fileName":"/a/b/f2.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/files-explicitly-excluded-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/files-explicitly-excluded-in-config-file.js
index 3dd5287c0c29a..65a69cb7d6087 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/files-explicitly-excluded-in-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/files-explicitly-excluded-in-config-file.js
@@ -64,14 +64,14 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
index a1adb29d11034..0dce038d5804f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
@@ -64,14 +64,14 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -131,14 +131,14 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -186,14 +186,14 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -244,16 +244,16 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 /a/b/commonfile2.ts:
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/if-config-file-doesnt-have-errors,-they-are-not-reported.js b/tests/baselines/reference/tscWatch/programUpdates/if-config-file-doesnt-have-errors,-they-are-not-reported.js
index 42c8939567406..b97d4db4b0731 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/if-config-file-doesnt-have-errors,-they-are-not-reported.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/if-config-file-doesnt-have-errors,-they-are-not-reported.js
@@ -52,14 +52,14 @@ WatchedFiles::
   {"fileName":"/a/b/app.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/non-existing-directories-listed-in-config-file-input-array-should-be-able-to-handle-@types-if-input-file-list-is-empty.js b/tests/baselines/reference/tscWatch/programUpdates/non-existing-directories-listed-in-config-file-input-array-should-be-able-to-handle-@types-if-input-file-list-is-empty.js
index 46c0fd771ac4e..8466d2e62d3c5 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/non-existing-directories-listed-in-config-file-input-array-should-be-able-to-handle-@types-if-input-file-list-is-empty.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/non-existing-directories-listed-in-config-file-input-array-should-be-able-to-handle-@types-if-input-file-list-is-empty.js
@@ -56,7 +56,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a/node_modules/@types:
-  {"directoryName":"/a/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/node_modules/@types"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/non-existing-directories-listed-in-config-file-input-array-should-be-tolerated-without-crashing-the-server.js b/tests/baselines/reference/tscWatch/programUpdates/non-existing-directories-listed-in-config-file-input-array-should-be-tolerated-without-crashing-the-server.js
index bc8812d17871d..f1bf8e3f92fa3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/non-existing-directories-listed-in-config-file-input-array-should-be-tolerated-without-crashing-the-server.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/non-existing-directories-listed-in-config-file-input-array-should-be-tolerated-without-crashing-the-server.js
@@ -45,18 +45,18 @@ No shapes updated in the builder::
 WatchedFiles::
 /a/b/tsconfig.json:
   {"fileName":"/a/b/tsconfig.json","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
+/a/b/app:
+  {"fileName":"/a/b/app","pollingInterval":500}
+/a/b/test:
+  {"fileName":"/a/b/test","pollingInterval":500}
+/a/b/something:
+  {"fileName":"/a/b/something","pollingInterval":500}
 
 FsWatches::
-/a/b/app:
-  {"directoryName":"/a/b/app","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/test:
-  {"directoryName":"/a/b/test","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/something:
-  {"directoryName":"/a/b/something","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
index 52728c1d945f4..f44279fbd6495 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
@@ -58,14 +58,14 @@ WatchedFiles::
   {"fileName":"/a/b/moduleFile.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -131,20 +131,20 @@ WatchedFiles::
   {"fileName":"/a/b/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
+/a/b/modulefile:
+  {"fileName":"/a/b/moduleFile","pollingInterval":500}
 /a/b/modulefile1.ts:
   {"fileName":"/a/b/moduleFile1.ts","pollingInterval":250}
 
 FsWatches::
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/modulefile:
-  {"directoryName":"/a/b/moduleFile","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -198,16 +198,16 @@ WatchedFiles::
   {"fileName":"/a/b/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 /a/b/modulefile.ts:
   {"fileName":"/a/b/moduleFile.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
index 187e8fe568146..af64ecde0727f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
@@ -122,7 +122,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
index 406f6217436ac..4166f16b7541b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
@@ -63,14 +63,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -132,14 +132,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
index cf4b0302ebedc..ef020d04628d3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
@@ -59,14 +59,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -130,14 +130,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-handle-non-existing-directories-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-handle-non-existing-directories-in-config-file.js
index 48ea2bbb8d547..816d00fe07eef 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-handle-non-existing-directories-in-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-handle-non-existing-directories-in-config-file.js
@@ -50,16 +50,16 @@ WatchedFiles::
   {"fileName":"/a/src/app.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/node_modules/@types:
+  {"fileName":"/a/node_modules/@types","pollingInterval":500}
+/a/notexistingfolder:
+  {"fileName":"/a/notexistingfolder","pollingInterval":500}
 
 FsWatches::
-/a/notexistingfolder:
-  {"directoryName":"/a/notexistingfolder","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 FsWatchesRecursive::
-/a/node_modules/@types:
-  {"directoryName":"/a/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/src:
-  {"directoryName":"/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/src"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-ignore-non-existing-files-specified-in-the-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-ignore-non-existing-files-specified-in-the-config-file.js
index 05c172cec7a46..04080d6345503 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-ignore-non-existing-files-specified-in-the-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-ignore-non-existing-files-specified-in-the-config-file.js
@@ -68,12 +68,12 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /a/b/commonfile3.ts:
   {"fileName":"/a/b/commonfile3.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
index 6eea8b4b620a9..e3fc789404c06 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
@@ -185,16 +185,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -240,16 +240,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -320,6 +320,8 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
@@ -327,11 +329,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -364,6 +364,8 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
@@ -371,11 +373,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
index aaa8113e67dc2..620c42fa2a32c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
@@ -185,16 +185,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -240,16 +240,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -320,6 +320,8 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
@@ -327,11 +329,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -364,6 +364,8 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
@@ -371,11 +373,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
index 18b7c7536b52b..6800711e1a42f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
@@ -185,16 +185,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -232,16 +232,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -312,6 +312,8 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
@@ -319,11 +321,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -352,6 +352,8 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
@@ -359,11 +361,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
index a665616e7e52a..7b96140fceb23 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
@@ -183,16 +183,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -227,16 +227,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -306,6 +306,8 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
@@ -313,11 +315,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -358,6 +358,8 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
@@ -365,11 +367,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
index e7e009453d856..1b21f2ca83fcc 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
@@ -185,16 +185,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -240,16 +240,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -320,6 +320,8 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
@@ -327,11 +329,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -364,6 +364,8 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
@@ -371,11 +373,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
index 641d0e341de4b..1b80ab46e46ad 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
@@ -185,16 +185,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -232,16 +232,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -312,6 +312,8 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
@@ -319,11 +321,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -352,6 +352,8 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.es2016.full.d.ts:
   {"fileName":"/a/lib/lib.es2016.full.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
@@ -359,11 +361,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
index e184266ab3290..f379dda653e4b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
@@ -68,14 +68,14 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /a/b/node_modules/module1/package.json:
   {"fileName":"/a/b/node_modules/module1/package.json","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /a/b/node_modules:
-  {"directoryName":"/a/b/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
@@ -130,14 +130,14 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /a/module1.ts:
   {"fileName":"/a/module1.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js
index f645329658ee8..bb0c712f75dd8 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js
@@ -67,12 +67,12 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -132,12 +132,12 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -190,12 +190,12 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js b/tests/baselines/reference/tscWatch/programUpdates/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js
index b008330c1a700..83192058d49be 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-tolerate-config-file-errors-and-still-try-to-build-a-project.js
@@ -69,14 +69,14 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/types-should-load-from-config-file-path-if-config-exists.js b/tests/baselines/reference/tscWatch/programUpdates/types-should-load-from-config-file-path-if-config-exists.js
index 15a7ea10a5d00..0349ba921b6d4 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/types-should-load-from-config-file-path-if-config-exists.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/types-should-load-from-config-file-path-if-config-exists.js
@@ -67,9 +67,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /a/b/node_modules:
-  {"directoryName":"/a/b/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/node_modules"}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
index 93da6eb6032ce..d6571f1f2e3e3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
@@ -77,7 +77,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
@@ -153,7 +153,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
@@ -202,7 +202,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
index 867a6d2485abc..b95366558d2e8 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
@@ -61,7 +61,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
@@ -123,7 +123,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
index b0e55c8eb889c..d49eea56c629a 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
@@ -51,14 +51,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/index.tsx","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -100,14 +100,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/index.tsx","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
index 3605988c3e4da..c29e44a58d755 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
@@ -59,14 +59,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -130,14 +130,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -188,14 +188,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -249,14 +249,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
index 4ae5b9f965fe5..cb29dd68ed9e2 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
@@ -62,14 +62,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -122,14 +122,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -177,14 +177,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -242,14 +242,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -297,14 +297,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-default-options.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-default-options.js
index 1a17c8122f8f6..488bb2415cd91 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-default-options.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-default-options.js
@@ -64,12 +64,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -117,12 +117,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -178,12 +178,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipDefaultLibCheck.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipDefaultLibCheck.js
index e82cd8de6d6fe..4f797d83b2383 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipDefaultLibCheck.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipDefaultLibCheck.js
@@ -59,12 +59,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -111,12 +111,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -166,12 +166,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipLibCheck.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipLibCheck.js
index 3a8ef27c8cc18..477651d48cf97 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipLibCheck.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipLibCheck.js
@@ -59,12 +59,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -111,12 +111,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -166,12 +166,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-default-options.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-default-options.js
index 0deb9a28021a7..93e433a34a981 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-default-options.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-default-options.js
@@ -61,12 +61,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -110,12 +110,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -172,12 +172,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipDefaultLibCheck.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipDefaultLibCheck.js
index e5082b418762a..65d2b54aef144 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipDefaultLibCheck.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipDefaultLibCheck.js
@@ -56,12 +56,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -104,12 +104,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -160,12 +160,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipLibCheck.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipLibCheck.js
index 8cacc65ae11db..a65540016c5e6 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipLibCheck.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipLibCheck.js
@@ -56,12 +56,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -104,12 +104,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -160,12 +160,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
index e02fc3be9519b..ce71c8e888fa1 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
@@ -52,14 +52,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -129,16 +129,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/b.ts:
   {"fileName":"/user/username/projects/myproject/b.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -182,14 +182,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
index 8515ccfb52b9e..76a9d533a63c7 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
@@ -63,7 +63,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
@@ -140,7 +140,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
index 97bd6b5fba7e3..e8849a90830dc 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
@@ -64,14 +64,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -120,14 +120,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
index bd8c98525622c..80b6a9c592175 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
@@ -51,14 +51,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -107,14 +107,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -159,14 +159,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -206,14 +206,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
index 5ce3779146643..410db4b1367bf 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
@@ -56,20 +56,20 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/tsconfig.json","pollingInterval":250}
 /user/username/projects/myproject/a.ts:
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
+/user/username/projects/myproject/data.json:
+  {"fileName":"/user/username/projects/myproject/data.json","pollingInterval":500}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
-/user/username/projects/myproject/data.json:
-  {"directoryName":"/user/username/projects/myproject/data.json","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -118,19 +118,18 @@ WatchedFiles::
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/data.json:
+  {"fileName":"/user/username/projects/myproject/data.json","pollingInterval":500}
   {"fileName":"/user/username/projects/myproject/data.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/data.json:
-  {"directoryName":"/user/username/projects/myproject/data.json","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js b/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
index 96a842a4a9cb1..6cf84cd6877f2 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
@@ -50,14 +50,14 @@ WatchedFiles::
   {"fileName":"/home/username/project/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/home/username/project/node_modules/@types:
+  {"fileName":"/home/username/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/home/username/project/node_modules/@types:
-  {"directoryName":"/home/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /home/username/project:
-  {"directoryName":"/home/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/home/username/project"}
 
 exitCode:: ExitStatus.undefined
 
@@ -101,16 +101,16 @@ WatchedFiles::
   {"fileName":"/home/username/project/tsconfig.json","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/home/username/project/node_modules/@types:
+  {"fileName":"/home/username/project/node_modules/@types","pollingInterval":500}
 /home/username/project/src/file2.ts:
   {"fileName":"/home/username/project/src/file2.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/home/username/project/node_modules/@types:
-  {"directoryName":"/home/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /home/username/project:
-  {"directoryName":"/home/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/home/username/project"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js b/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
index fe976b5d9346a..2c6d1ff7e912d 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
@@ -61,14 +61,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/index.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -98,14 +98,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/index.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
index af10639931622..27c0214047124 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
@@ -73,16 +73,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/client/linktofolder2/module2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject/client:
-  {"directoryName":"/user/username/projects/myproject/client","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/client"}
 /user/username/projects/myproject/folder2:
-  {"directoryName":"/user/username/projects/myproject/folder2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/folder2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -154,18 +154,18 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/client/linktofolder2/module2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/client/linktofolder2/module3.ts:
   {"fileName":"/user/username/projects/myproject/client/linktofolder2/module3.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject/client:
-  {"directoryName":"/user/username/projects/myproject/client","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/client"}
 /user/username/projects/myproject/folder2:
-  {"directoryName":"/user/username/projects/myproject/folder2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/folder2"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
index c1884b9430b9a..c686575de488a 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
@@ -87,20 +87,20 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -216,6 +216,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/projects/project1/class3.d.ts:
   {"fileName":"/user/username/projects/myproject/projects/project1/class3.d.ts","pollingInterval":250}
 
@@ -223,15 +229,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -294,6 +294,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/projects/project1/class3.d.ts:
   {"fileName":"/user/username/projects/myproject/projects/project1/class3.d.ts","pollingInterval":250}
 
@@ -301,15 +307,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -392,6 +392,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/projects/project1/class3.d.ts:
   {"fileName":"/user/username/projects/myproject/projects/project1/class3.d.ts","pollingInterval":250}
 
@@ -399,15 +405,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -473,6 +473,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/projects/project1/class3.d.ts:
   {"fileName":"/user/username/projects/myproject/projects/project1/class3.d.ts","pollingInterval":250}
 
@@ -480,15 +486,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -593,6 +593,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/projects/project1/class3.d.ts:
   {"fileName":"/user/username/projects/myproject/projects/project1/class3.d.ts","pollingInterval":250}
 
@@ -600,15 +606,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
index 0f93f9716b775..1b11e0c86e318 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
@@ -80,14 +80,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -138,14 +138,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -198,14 +198,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -262,14 +262,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -321,14 +321,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -376,14 +376,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -441,14 +441,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/b.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js b/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js
index 41c1ab3576ca7..eb86e16b5733e 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/works-correctly-when-config-file-is-changed-but-its-content-havent.js
@@ -61,12 +61,12 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -107,12 +107,12 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
index 61b51a6589ac0..82a4e297d8331 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
@@ -420,18 +420,18 @@ WatchedFiles::
   {"fileName":"/user/username/projects/sample1/core/anotherModule.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/sample1/tests/node_modules/@types:
+  {"fileName":"/user/username/projects/sample1/tests/node_modules/@types","pollingInterval":500}
+/user/username/projects/sample1/node_modules/@types:
+  {"fileName":"/user/username/projects/sample1/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/sample1/tests/node_modules/@types:
-  {"directoryName":"/user/username/projects/sample1/tests/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/sample1/node_modules/@types:
-  {"directoryName":"/user/username/projects/sample1/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -594,18 +594,18 @@ WatchedFiles::
   {"fileName":"/user/username/projects/sample1/core/anotherModule.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/sample1/tests/node_modules/@types:
+  {"fileName":"/user/username/projects/sample1/tests/node_modules/@types","pollingInterval":500}
+/user/username/projects/sample1/node_modules/@types:
+  {"fileName":"/user/username/projects/sample1/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/sample1/tests/node_modules/@types:
-  {"directoryName":"/user/username/projects/sample1/tests/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/sample1/node_modules/@types:
-  {"directoryName":"/user/username/projects/sample1/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -780,18 +780,18 @@ WatchedFiles::
   {"fileName":"/user/username/projects/sample1/core/anotherModule.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/sample1/tests/node_modules/@types:
+  {"fileName":"/user/username/projects/sample1/tests/node_modules/@types","pollingInterval":500}
+/user/username/projects/sample1/node_modules/@types:
+  {"fileName":"/user/username/projects/sample1/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/sample1/tests/node_modules/@types:
-  {"directoryName":"/user/username/projects/sample1/tests/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/sample1/node_modules/@types:
-  {"directoryName":"/user/username/projects/sample1/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1037,6 +1037,10 @@ WatchedFiles::
   {"fileName":"/user/username/projects/sample1/core/anotherModule.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/sample1/tests/node_modules/@types:
+  {"fileName":"/user/username/projects/sample1/tests/node_modules/@types","pollingInterval":500}
+/user/username/projects/sample1/node_modules/@types:
+  {"fileName":"/user/username/projects/sample1/node_modules/@types","pollingInterval":500}
 /user/username/projects/sample1/logic/decls/index.d.ts:
   {"fileName":"/user/username/projects/sample1/logic/decls/index.d.ts","pollingInterval":250}
 
@@ -1044,13 +1048,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/sample1/core:
-  {"directoryName":"/user/username/projects/sample1/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/core"}
 /user/username/projects/sample1/logic:
-  {"directoryName":"/user/username/projects/sample1/logic","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/sample1/tests/node_modules/@types:
-  {"directoryName":"/user/username/projects/sample1/tests/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/sample1/node_modules/@types:
-  {"directoryName":"/user/username/projects/sample1/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/sample1/logic"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
index 6cd4f1cec3e84..d0b6739425308 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
@@ -242,26 +242,26 @@ WatchedFiles::
   {"fileName":"/user/username/projects/transitivereferences/b/package.json","pollingInterval":250}
 /user/username/projects/transitivereferences/a/package.json:
   {"fileName":"/user/username/projects/transitivereferences/a/package.json","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitivereferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/b"}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitivereferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/a"}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/c:
-  {"directoryName":"/user/username/projects/transitivereferences/c","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/c"}
 
 exitCode:: ExitStatus.undefined
 
@@ -408,26 +408,26 @@ WatchedFiles::
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitivereferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/b"}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitivereferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/a"}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/c:
-  {"directoryName":"/user/username/projects/transitivereferences/c","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/c"}
 
 exitCode:: ExitStatus.undefined
 
@@ -512,26 +512,26 @@ WatchedFiles::
   {"fileName":"/user/username/projects/transitivereferences/b/package.json","pollingInterval":250}
 /user/username/projects/transitivereferences/a/package.json:
   {"fileName":"/user/username/projects/transitivereferences/a/package.json","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitivereferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/b"}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitivereferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/a"}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
 /user/username/projects/transitivereferences/c:
-  {"directoryName":"/user/username/projects/transitivereferences/c","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/c"}
 /user/username/projects/transitivereferences/nrefs:
-  {"directoryName":"/user/username/projects/transitiveReferences/nrefs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/nrefs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -611,26 +611,26 @@ WatchedFiles::
   {"fileName":"/user/username/projects/transitivereferences/a/package.json","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitivereferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/b"}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitivereferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/a"}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
 /user/username/projects/transitivereferences/c:
-  {"directoryName":"/user/username/projects/transitivereferences/c","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/c"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -704,29 +704,29 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/nrefs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/nrefs/a.d.ts","pollingInterval":250}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitivereferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/b"}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitivereferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/a"}
 /user/username/projects/transitivereferences/c:
-  {"directoryName":"/user/username/projects/transitivereferences/c","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/c"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/nrefs:
-  {"directoryName":"/user/username/projects/transitiveReferences/nrefs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/nrefs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -792,25 +792,25 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitivereferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/b"}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitivereferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/a"}
 /user/username/projects/transitivereferences/c:
-  {"directoryName":"/user/username/projects/transitivereferences/c","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/c"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -877,24 +877,24 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/b/index.ts:
   {"fileName":"/user/username/projects/transitiveReferences/b/index.ts","pollingInterval":250}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/c:
-  {"directoryName":"/user/username/projects/transitivereferences/c","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/c"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -967,6 +967,10 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/a/tsconfig.json:
   {"fileName":"/user/username/projects/transitiveReferences/a/tsconfig.json","pollingInterval":250}
 /user/username/projects/transitivereferences/b/index.d.ts:
@@ -978,23 +982,19 @@ WatchedFiles::
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitivereferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
+  {"directoryName":"/user/username/projects/transitivereferences/b"}
 /user/username/projects/transitivereferences/c:
-  {"directoryName":"/user/username/projects/transitivereferences/c","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/c"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitivereferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/a"}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1067,6 +1067,10 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/a/tsconfig.json:
   {"fileName":"/user/username/projects/transitiveReferences/a/tsconfig.json","pollingInterval":250}
 /user/username/projects/transitivereferences/b/index.d.ts:
@@ -1076,22 +1080,18 @@ WatchedFiles::
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitivereferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
+  {"directoryName":"/user/username/projects/transitivereferences/b"}
 /user/username/projects/transitivereferences/c:
-  {"directoryName":"/user/username/projects/transitivereferences/c","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/c"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1163,6 +1163,10 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/a/tsconfig.json:
   {"fileName":"/user/username/projects/transitiveReferences/a/tsconfig.json","pollingInterval":250}
 /user/username/projects/transitivereferences/b/index.d.ts:
@@ -1172,23 +1176,19 @@ WatchedFiles::
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitivereferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
+  {"directoryName":"/user/username/projects/transitivereferences/b"}
 /user/username/projects/transitivereferences/c:
-  {"directoryName":"/user/username/projects/transitivereferences/c","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitivereferences/c"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/transitivereferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
+  {"directoryName":"/user/username/projects/transitivereferences/a"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
index 317f977848d72..e9138f9da6de7 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
@@ -242,22 +242,22 @@ WatchedFiles::
   {"fileName":"/user/username/projects/transitivereferences/b/package.json","pollingInterval":250}
 /user/username/projects/transitivereferences/a/package.json:
   {"fileName":"/user/username/projects/transitivereferences/a/package.json","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -404,22 +404,22 @@ WatchedFiles::
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -504,22 +504,22 @@ WatchedFiles::
   {"fileName":"/user/username/projects/transitivereferences/b/package.json","pollingInterval":250}
 /user/username/projects/transitivereferences/a/package.json:
   {"fileName":"/user/username/projects/transitivereferences/a/package.json","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/nrefs:
-  {"directoryName":"/user/username/projects/transitiveReferences/nrefs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/nrefs"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -599,22 +599,22 @@ WatchedFiles::
   {"fileName":"/user/username/projects/transitivereferences/a/package.json","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -688,24 +688,24 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/nrefs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/nrefs/a.d.ts","pollingInterval":250}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/nrefs:
-  {"directoryName":"/user/username/projects/transitiveReferences/nrefs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/nrefs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -771,20 +771,20 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -851,22 +851,22 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/b/index.ts:
   {"fileName":"/user/username/projects/transitiveReferences/b/index.ts","pollingInterval":250}
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -939,6 +939,10 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/a/tsconfig.json:
   {"fileName":"/user/username/projects/transitiveReferences/a/tsconfig.json","pollingInterval":250}
 /user/username/projects/transitivereferences/b/index.d.ts:
@@ -950,19 +954,15 @@ WatchedFiles::
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1035,6 +1035,10 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/a/tsconfig.json:
   {"fileName":"/user/username/projects/transitiveReferences/a/tsconfig.json","pollingInterval":250}
 /user/username/projects/transitivereferences/b/index.d.ts:
@@ -1044,19 +1048,15 @@ WatchedFiles::
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1128,6 +1128,10 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/c/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/c/node_modules/@types","pollingInterval":500}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/a/tsconfig.json:
   {"fileName":"/user/username/projects/transitiveReferences/a/tsconfig.json","pollingInterval":250}
 /user/username/projects/transitivereferences/b/index.d.ts:
@@ -1137,19 +1141,15 @@ WatchedFiles::
 
 FsWatches::
 /user/username/projects/transitivereferences:
-  {"directoryName":"/user/username/projects/transitiveReferences","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences"}
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
-  {"directoryName":"/user/username/projects/transitiveReferences/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/b"}
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/c/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/c/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/a:
-  {"directoryName":"/user/username/projects/transitiveReferences/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/a"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js
index 1ff6e1dd59894..8e892434d594b 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references.js
@@ -262,14 +262,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -417,14 +417,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -505,14 +505,14 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/nrefs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/nrefs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/nrefs:
-  {"directoryName":"/user/username/projects/transitiveReferences/nrefs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/nrefs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -588,14 +588,14 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -669,6 +669,8 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/nrefs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/nrefs/a.d.ts","pollingInterval":250}
 
@@ -676,11 +678,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 /user/username/projects/transitivereferences/nrefs:
-  {"directoryName":"/user/username/projects/transitiveReferences/nrefs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/nrefs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -746,14 +746,14 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -820,6 +820,8 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/b.ts:
   {"fileName":"/user/username/projects/transitiveReferences/b.ts","pollingInterval":250}
 
@@ -827,9 +829,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -913,6 +913,8 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/tsconfig.a.json:
   {"fileName":"/user/username/projects/transitiveReferences/tsconfig.a.json","pollingInterval":250}
 /user/username/projects/transitivereferences/b.d.ts:
@@ -924,9 +926,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -999,6 +999,8 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/tsconfig.a.json:
   {"fileName":"/user/username/projects/transitiveReferences/tsconfig.a.json","pollingInterval":250}
 /user/username/projects/transitivereferences/b.d.ts:
@@ -1010,9 +1012,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
@@ -1085,6 +1085,8 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/transitivereferences/refs/a.d.ts:
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 /user/username/projects/transitivereferences/tsconfig.a.json:
   {"fileName":"/user/username/projects/transitiveReferences/tsconfig.a.json","pollingInterval":250}
 /user/username/projects/transitivereferences/b.d.ts:
@@ -1096,9 +1098,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js b/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js
index 4d3501b96fe19..a7b19fb1424e7 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/when-referenced-project-uses-different-module-resolution.js
@@ -249,14 +249,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/transitiveReferences/refs/a.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/transitivereferences/node_modules/@types:
+  {"fileName":"/user/username/projects/transitiveReferences/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/refs:
-  {"directoryName":"/user/username/projects/transitiveReferences/refs","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/transitivereferences/node_modules/@types:
-  {"directoryName":"/user/username/projects/transitiveReferences/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/transitiveReferences/refs"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
index 64d57dfe2a7f4..ec5ba33068815 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
@@ -68,7 +68,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -141,7 +141,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -192,16 +192,16 @@ WatchedFiles::
   {"fileName":"/a/d/f0.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/node_modules:
+  {"fileName":"/node_modules","pollingInterval":500}
 
 FsWatches::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/node_modules:
-  {"directoryName":"/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -267,7 +267,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
index 5cd6ea169cf8a..4983e21f361fc 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
@@ -60,16 +60,16 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/somemodule/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/somemodule/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -99,16 +99,16 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/somemodule/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/somemodule/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
index 2b076ec86b5b5..85f14d17a90e3 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
@@ -63,7 +63,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user:
-  {"directoryName":"/user","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user"}
 
 exitCode:: ExitStatus.undefined
 
@@ -96,7 +96,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user:
-  {"directoryName":"/user","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
index c13df4fd4be34..fe2afcf3739ba 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
@@ -50,16 +50,16 @@ WatchedFiles::
   {"fileName":"/a/foo.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/node_modules:
+  {"fileName":"/node_modules","pollingInterval":500}
 
 FsWatches::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/node_modules:
-  {"directoryName":"/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -117,7 +117,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
index 40374b75d6da9..a7a69e9bbf8fb 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
@@ -58,7 +58,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -106,16 +106,16 @@ WatchedFiles::
   {"fileName":"/a/foo.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/node_modules:
+  {"fileName":"/node_modules","pollingInterval":500}
 
 FsWatches::
 /:
-  {"directoryName":"","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":""}
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/node_modules:
-  {"directoryName":"/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
@@ -164,7 +164,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a:
-  {"directoryName":"/a","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
index ac6b4a0970d76..30ba8ca1f84a9 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
@@ -57,14 +57,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/lib/app.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules:
+  {"fileName":"/user/username/projects/myproject/node_modules","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -87,6 +87,7 @@ declare namespace myapp {
 
 
 Output::
+sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
@@ -126,10 +127,10 @@ WatchedFiles::
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
+/user/username/projects/myproject/node_modules:
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
@@ -156,10 +157,10 @@ WatchedFiles::
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
+/user/username/projects/myproject/node_modules:
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/with-modules-linked-to-sibling-folder.js b/tests/baselines/reference/tscWatch/resolutionCache/with-modules-linked-to-sibling-folder.js
index d6c57a43371fe..35fecf02e88db 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/with-modules-linked-to-sibling-folder.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/with-modules-linked-to-sibling-folder.js
@@ -70,22 +70,22 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/linked-package/dist/other.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/main/@scoped:
+  {"fileName":"/user/username/projects/myproject/main/@scoped","pollingInterval":500}
 /user/username/projects/myproject/linked-package/package.json:
   {"fileName":"/user/username/projects/myproject/linked-package/package.json","pollingInterval":250}
+/user/username/projects/myproject/main/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/main/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/linked-package:
-  {"directoryName":"/user/username/projects/myproject/linked-package","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/main/@scoped:
-  {"directoryName":"/user/username/projects/myproject/main/@scoped","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/linked-package"}
 /user/username/projects/myproject/main/node_modules:
-  {"directoryName":"/user/username/projects/myproject/main/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/main/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/main/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/main/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-included-file-with-ambient-module-changes.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-included-file-with-ambient-module-changes.js
index 5f4cbc0eb30f6..7a31ccf2e162a 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-included-file-with-ambient-module-changes.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-included-file-with-ambient-module-changes.js
@@ -67,14 +67,14 @@ WatchedFiles::
   {"fileName":"/a/b/bar.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules:
+  {"fileName":"/a/b/node_modules","pollingInterval":500}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules:
-  {"directoryName":"/a/b/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -134,14 +134,14 @@ WatchedFiles::
   {"fileName":"/a/b/bar.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules:
+  {"fileName":"/a/b/node_modules","pollingInterval":500}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules:
-  {"directoryName":"/a/b/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
index 0f536d2d6faf1..fcfaf1cb4c3a4 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
@@ -113,11 +113,11 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/@types"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -262,11 +262,11 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/@types"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -358,11 +358,11 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/@types"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -430,11 +430,11 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/@types"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -550,11 +550,11 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/@types"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
index 77ffc10c76f48..c712851e8d1d0 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
@@ -50,14 +50,14 @@ WatchedFiles::
   {"fileName":"/a/b/foo.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules:
+  {"fileName":"/a/b/node_modules","pollingInterval":500}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules:
-  {"directoryName":"/a/b/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -87,6 +87,7 @@ declare module "fs" {
 
 
 Output::
+sysLog:: /a/b/node_modules:: Changing watcher to PresentFileSystemEntryWatchersysLog:: /a/b/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
@@ -128,7 +129,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/node_modules/@types"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
index dfbb07b5eeecd..8e1f319c075f2 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
@@ -53,14 +53,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/a.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules:
+  {"fileName":"/user/username/projects/myproject/node_modules","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
@@ -79,6 +79,7 @@ export {}
 //// [/user/username/projects/myproject/node_modules2/@types/qqq/index.d.ts] deleted
 
 Output::
+sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatchersysLog:: /user/username/projects/myproject/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
@@ -118,9 +119,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/@types"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
index 93c8aeaf958d9..57076cf6e3a80 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
@@ -68,22 +68,22 @@ WatchedFiles::
   {"fileName":"/a/b/projects/myProject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/projects/myproject/src/node_modules:
+  {"fileName":"/a/b/projects/myProject/src/node_modules","pollingInterval":500}
 /a/b/projects/myproject/node_modules/module1/package.json:
   {"fileName":"/a/b/projects/myproject/node_modules/module1/package.json","pollingInterval":250}
+/a/b/projects/myproject/src/node_modules/@types:
+  {"fileName":"/a/b/projects/myProject/src/node_modules/@types","pollingInterval":500}
+/a/b/projects/myproject/node_modules/@types:
+  {"fileName":"/a/b/projects/myProject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/projects/myproject/src/node_modules:
-  {"directoryName":"/a/b/projects/myProject/src/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b/projects/myproject/node_modules:
-  {"directoryName":"/a/b/projects/myProject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/projects/myproject/src/node_modules/@types:
-  {"directoryName":"/a/b/projects/myProject/src/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/projects/myproject/node_modules/@types:
-  {"directoryName":"/a/b/projects/myProject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/projects/myProject/node_modules"}
 /a/b/projects/myproject/src:
-  {"directoryName":"/a/b/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/projects/myproject/src"}
 
 exitCode:: ExitStatus.undefined
 
@@ -145,20 +145,20 @@ WatchedFiles::
   {"fileName":"/a/b/projects/myProject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/projects/myproject/src/node_modules:
+  {"fileName":"/a/b/projects/myProject/src/node_modules","pollingInterval":500}
+/a/b/projects/myproject/src/node_modules/@types:
+  {"fileName":"/a/b/projects/myProject/src/node_modules/@types","pollingInterval":500}
+/a/b/projects/myproject/node_modules/@types:
+  {"fileName":"/a/b/projects/myProject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/projects/myproject/src/node_modules:
-  {"directoryName":"/a/b/projects/myProject/src/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b/projects/myproject/node_modules:
-  {"directoryName":"/a/b/projects/myProject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/projects/myproject/src/node_modules/@types:
-  {"directoryName":"/a/b/projects/myProject/src/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/projects/myproject/node_modules/@types:
-  {"directoryName":"/a/b/projects/myProject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/projects/myProject/node_modules"}
 /a/b/projects/myproject/src:
-  {"directoryName":"/a/b/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/projects/myproject/src"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js
index dfcb553d113b9..48888dfcbe311 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js
@@ -217,31 +217,31 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js
index 8d9938e3c2f7d..a0cee47023332 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js
@@ -217,31 +217,31 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks.js
index e33dc889abee4..652a076e6675f 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks.js
@@ -79,31 +79,31 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js
index 1fa905db8207b..6379e9fedfd43 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js
@@ -217,31 +217,31 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
index ea4d108d8025e..e3992bbe8693c 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
@@ -217,31 +217,31 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks.js
index ca06367e52e09..0ae4d0ac004d6 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks.js
@@ -79,31 +79,31 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package.js
index b4fc0c61f64e5..44f0178407ba9 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package.js
@@ -79,31 +79,31 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field.js
index 17f7653b71c29..4f18dcaa7621c 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field.js
@@ -79,31 +79,31 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js
index fe04599afb4ae..64f2b169a8db6 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js
@@ -217,33 +217,33 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar/foo.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/lib/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/foo/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/foo/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js
index 7ac28369d8853..d4d9147a27c6e 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js
@@ -217,33 +217,33 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar/foo.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/lib/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/foo/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/foo/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks.js
index 444de1c145a95..4b864a65dbcd1 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks.js
@@ -79,33 +79,33 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar/foo.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/lib/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/foo/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/foo/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js
index b07af8c25e319..8c19e194695ac 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js
@@ -217,33 +217,33 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar/foo.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/lib/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/foo/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/foo/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
index ae9408fe9835d..929b3394ffffb 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
@@ -217,33 +217,33 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar/foo.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/lib/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/foo/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/foo/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks.js
index 99a07c3d2a35e..4557579cd0cab 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks.js
@@ -79,33 +79,33 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar/foo.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/lib/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/foo/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/foo/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package.js
index 903e03e6061d2..6661025bb77c2 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package.js
@@ -79,33 +79,33 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar/foo.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/lib/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/foo/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/foo/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder.js
index 5497b50617968..e41f7f1c09b6c 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder.js
@@ -79,33 +79,33 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/packages/B/src/bar/foo.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules","pollingInterval":500}
 /user/username/projects/myproject/packages/b/lib/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/foo/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/package.json","pollingInterval":250}
 /user/username/projects/myproject/packages/b/lib/bar/foo/package.json:
   {"fileName":"/user/username/projects/myproject/packages/b/lib/bar/foo/package.json","pollingInterval":250}
+/user/username/projects/myproject/packages/a/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/A/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/packages/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/packages/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/packages/b/src:
-  {"directoryName":"/user/username/projects/myproject/packages/b/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/b/src"}
 /user/username/projects/myproject/packages/a/src:
-  {"directoryName":"/user/username/projects/myproject/packages/A/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/packages/a/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/packages/A/src"}
+  {"directoryName":"/user/username/projects/myproject/packages/a/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/a/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/A/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/packages/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/packages/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project-when-solution-is-already-built.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project-when-solution-is-already-built.js
index 1e4d9c6628377..e33746ccd0f1e 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project-when-solution-is-already-built.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project-when-solution-is-already-built.js
@@ -359,20 +359,20 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/demo/animals/package.json:
   {"fileName":"/user/username/projects/demo/animals/package.json","pollingInterval":250}
+/user/username/projects/demo/animals/node_modules/@types:
+  {"fileName":"/user/username/projects/demo/animals/node_modules/@types","pollingInterval":500}
+/user/username/projects/demo/node_modules/@types:
+  {"fileName":"/user/username/projects/demo/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/demo/animals:
-  {"directoryName":"/user/username/projects/demo/animals","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/animals"}
 
 FsWatchesRecursive::
 /user/username/projects/demo/core:
-  {"directoryName":"/user/username/projects/demo/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/demo/animals/node_modules/@types:
-  {"directoryName":"/user/username/projects/demo/animals/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/demo/node_modules/@types:
-  {"directoryName":"/user/username/projects/demo/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/core"}
 /user/username/projects/demo/animals:
-  {"directoryName":"/user/username/projects/demo/animals","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/animals"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project.js b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project.js
index f4c8657f89a6a..7eff86627cd9f 100644
--- a/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project.js
+++ b/tests/baselines/reference/tscWatch/sourceOfProjectReferenceRedirect/with-simple-project.js
@@ -153,20 +153,20 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/demo/animals/package.json:
   {"fileName":"/user/username/projects/demo/animals/package.json","pollingInterval":250}
+/user/username/projects/demo/animals/node_modules/@types:
+  {"fileName":"/user/username/projects/demo/animals/node_modules/@types","pollingInterval":500}
+/user/username/projects/demo/node_modules/@types:
+  {"fileName":"/user/username/projects/demo/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/demo/animals:
-  {"directoryName":"/user/username/projects/demo/animals","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/animals"}
 
 FsWatchesRecursive::
 /user/username/projects/demo/core:
-  {"directoryName":"/user/username/projects/demo/core","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/demo/animals/node_modules/@types:
-  {"directoryName":"/user/username/projects/demo/animals/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/demo/node_modules/@types:
-  {"directoryName":"/user/username/projects/demo/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/core"}
 /user/username/projects/demo/animals:
-  {"directoryName":"/user/username/projects/demo/animals","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/demo/animals"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js b/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
index 3cb760382f373..059b90a59d1d9 100644
--- a/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
+++ b/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
@@ -58,14 +58,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.vue","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -116,16 +116,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.vue","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/other2.vue:
   {"fileName":"/user/username/projects/myproject/other2.vue","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-emit-builder.js b/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-emit-builder.js
index 9c424cba570ff..6680bfef7c495 100644
--- a/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-emit-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-emit-builder.js
@@ -58,14 +58,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -151,14 +151,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -266,14 +266,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -355,14 +355,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -458,14 +458,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-semantic-builder.js b/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-semantic-builder.js
index 0b67343295800..326235c9533a4 100644
--- a/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-semantic-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/noEmit-with-composite-with-semantic-builder.js
@@ -58,14 +58,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -158,14 +158,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -280,14 +280,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -376,14 +376,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -486,14 +486,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-emit-builder.js b/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-emit-builder.js
index 4ca9f5dcdf673..64adf225b23f7 100644
--- a/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-emit-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-emit-builder.js
@@ -63,14 +63,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -184,14 +184,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -299,14 +299,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-semantic-builder.js b/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-semantic-builder.js
index d5fd4d074b4ec..976b26c3befb9 100644
--- a/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-semantic-builder.js
+++ b/tests/baselines/reference/tscWatch/watchApi/noEmitOnError-with-composite-with-semantic-builder.js
@@ -63,14 +63,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -191,14 +191,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -313,14 +313,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/semantic-builder-emitOnlyDts.js b/tests/baselines/reference/tscWatch/watchApi/semantic-builder-emitOnlyDts.js
index 2124226bf4454..69fd910d013a5 100644
--- a/tests/baselines/reference/tscWatch/watchApi/semantic-builder-emitOnlyDts.js
+++ b/tests/baselines/reference/tscWatch/watchApi/semantic-builder-emitOnlyDts.js
@@ -63,14 +63,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -177,14 +177,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
index 93e8cdd0f6c6d..7f5292f597fa5 100644
--- a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
+++ b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
@@ -58,14 +58,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -109,14 +109,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/other.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/verify-that-module-resolution-with-json-extension-works-when-returned-without-extension.js b/tests/baselines/reference/tscWatch/watchApi/verify-that-module-resolution-with-json-extension-works-when-returned-without-extension.js
index b569dd310d3f1..8cf3621e0c5f0 100644
--- a/tests/baselines/reference/tscWatch/watchApi/verify-that-module-resolution-with-json-extension-works-when-returned-without-extension.js
+++ b/tests/baselines/reference/tscWatch/watchApi/verify-that-module-resolution-with-json-extension-works-when-returned-without-extension.js
@@ -68,12 +68,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/settings.json","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/verify-that-the-error-count-is-correctly-passed-down-to-the-watch-status-reporter.js b/tests/baselines/reference/tscWatch/watchApi/verify-that-the-error-count-is-correctly-passed-down-to-the-watch-status-reporter.js
index 17f91edc17505..ba249291278a4 100644
--- a/tests/baselines/reference/tscWatch/watchApi/verify-that-the-error-count-is-correctly-passed-down-to-the-watch-status-reporter.js
+++ b/tests/baselines/reference/tscWatch/watchApi/verify-that-the-error-count-is-correctly-passed-down-to-the-watch-status-reporter.js
@@ -65,12 +65,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/index.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
index 4118a2f21c3e2..c35f9a73d9357 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
@@ -87,20 +87,20 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -216,6 +216,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/projects/project1/class3.d.ts:
   {"fileName":"/user/username/projects/myproject/projects/project1/class3.d.ts","pollingInterval":250}
 
@@ -223,15 +229,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -294,6 +294,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/projects/project1/class3.d.ts:
   {"fileName":"/user/username/projects/myproject/projects/project1/class3.d.ts","pollingInterval":250}
 
@@ -301,15 +307,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -392,6 +392,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/projects/project1/class3.d.ts:
   {"fileName":"/user/username/projects/myproject/projects/project1/class3.d.ts","pollingInterval":250}
 
@@ -399,15 +405,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -473,6 +473,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/projects/project1/class3.d.ts:
   {"fileName":"/user/username/projects/myproject/projects/project1/class3.d.ts","pollingInterval":250}
 
@@ -480,15 +486,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -593,6 +593,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/projects/project1/class3.d.ts:
   {"fileName":"/user/username/projects/myproject/projects/project1/class3.d.ts","pollingInterval":250}
 
@@ -600,15 +606,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
index d75dca263485b..83f887411c96f 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
@@ -87,20 +87,20 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -215,6 +215,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/projects/project1/class3.ts:
   {"fileName":"/user/username/projects/myproject/projects/project1/class3.ts","pollingInterval":250}
 
@@ -222,15 +228,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -313,6 +313,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/projects/project1/class3.ts:
   {"fileName":"/user/username/projects/myproject/projects/project1/class3.ts","pollingInterval":250}
 
@@ -320,15 +326,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
@@ -357,6 +357,12 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/projects/project2/class2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/projects/project2/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/project2/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/projects/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/projects/node_modules/@types","pollingInterval":500}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/projects/project1/class3.ts:
   {"fileName":"/user/username/projects/myproject/projects/project1/class3.ts","pollingInterval":250}
 
@@ -364,15 +370,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/projects/project1:
-  {"directoryName":"/user/username/projects/myproject/projects/project1","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/project2/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/project2/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/projects/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/projects/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project1"}
 /user/username/projects/myproject/projects/project2:
-  {"directoryName":"/user/username/projects/myproject/projects/project2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/projects/project2"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
index ff7be3bc4966c..4c5a5c4a2a475 100644
--- a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
+++ b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
@@ -50,14 +50,14 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/main.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -102,16 +102,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/main.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/bar.ts:
   {"fileName":"/user/username/projects/myproject/bar.ts","pollingInterval":250}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
new file mode 100644
index 0000000000000..caded90c6c1bb
--- /dev/null
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
@@ -0,0 +1,244 @@
+Input::
+//// [/a/lib/lib.d.ts] Inode:: 3
+/// <reference no-default-lib="true"/>
+interface Boolean {}
+interface Function {}
+interface CallableFunction {}
+interface NewableFunction {}
+interface IArguments {}
+interface Number { toExponential: any; }
+interface Object {}
+interface RegExp {}
+interface String { charAt: any; }
+interface Array<T> { length: number; [n: number]: T; }
+
+//// [/user/username/projects/myproject/main.ts] Inode:: 8
+import { foo } from "./foo"; foo();
+
+//// [/user/username/projects/myproject/foo.d.ts] Inode:: 9
+export function foo(): string;
+
+//// [/user/username/projects/myproject/tsconfig.json] Inode:: 10
+{"watchOptions":{"watchFile":"useFsEvents"},"files":["foo.d.ts","main.ts"]}
+
+
+/a/lib/tsc.js -w --extendedDiagnostics
+Output::
+[12:00:23 AM] Starting compilation in watch mode...
+
+Current directory: /user/username/projects/myproject CaseSensitiveFileNames: false
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 {"watchFile":4} Config file
+Synchronizing program
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main.ts 250 {"watchFile":4} Source file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 {"watchFile":4} Source file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+[12:00:26 AM] Found 0 errors. Watching for file changes.
+
+
+
+Program root files: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
+Program options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+Program structureReused: Not
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.d.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.d.ts
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/a/lib/lib.d.ts (used version)
+/user/username/projects/myproject/foo.d.ts (used version)
+/user/username/projects/myproject/main.ts (used version)
+
+WatchedFiles::
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+/user/username/projects/myproject/tsconfig.json:
+  {"directoryName":"/user/username/projects/myproject/tsconfig.json","inode":10}
+/user/username/projects/myproject/foo.d.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.d.ts","inode":9}
+/user/username/projects/myproject/main.ts:
+  {"directoryName":"/user/username/projects/myproject/main.ts","inode":8}
+/user/username/projects/myproject:
+  {"directoryName":"/user/username/projects/myproject","inode":7}
+/a/lib/lib.d.ts:
+  {"directoryName":"/a/lib/lib.d.ts","inode":3}
+
+FsWatchesRecursive::
+
+exitCode:: ExitStatus.undefined
+
+//// [/user/username/projects/myproject/main.js] Inode:: 11
+"use strict";
+exports.__esModule = true;
+var foo_1 = require("./foo");
+(0, foo_1.foo)();
+
+
+
+Change:: Replace file with rename event that introduces error
+
+Input::
+//// [/user/username/projects/myproject/foo.d.ts] Inode:: 12
+export function foo2(): string;
+
+
+Output::
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcherFileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Scheduling invalidateFailedLookup
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcherFileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Scheduling invalidateFailedLookup, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Synchronizing program
+[12:00:30 AM] File change detected. Starting incremental compilation...
+
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+main.ts:1:10 - error TS2724: '"./foo"' has no exported member named 'foo'. Did you mean 'foo2'?
+
+1 import { foo } from "./foo"; foo();
+           ~~~
+
+  foo.d.ts:1:17
+    1 export function foo2(): string;
+                      ~~~~
+    'foo2' is declared here.
+
+[12:00:34 AM] Found 1 error. Watching for file changes.
+
+
+
+Program root files: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
+Program options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+Program structureReused: SafeModules
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.d.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/foo.d.ts
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/user/username/projects/myproject/foo.d.ts (used version)
+/user/username/projects/myproject/main.ts (computed .d.ts)
+
+WatchedFiles::
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+/user/username/projects/myproject/tsconfig.json:
+  {"directoryName":"/user/username/projects/myproject/tsconfig.json","inode":10}
+/user/username/projects/myproject/main.ts:
+  {"directoryName":"/user/username/projects/myproject/main.ts","inode":8}
+/user/username/projects/myproject:
+  {"directoryName":"/user/username/projects/myproject","inode":7}
+/a/lib/lib.d.ts:
+  {"directoryName":"/a/lib/lib.d.ts","inode":3}
+/user/username/projects/myproject/foo.d.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.d.ts","inode":12}
+
+FsWatchesRecursive::
+
+exitCode:: ExitStatus.undefined
+
+//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 11
+
+Change:: Replace file with rename event that fixes error
+
+Input::
+//// [/user/username/projects/myproject/foo.d.ts] Inode:: 13
+export function foo(): string;
+
+
+Output::
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcherFileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Scheduling invalidateFailedLookup
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcherFileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Scheduling invalidateFailedLookup, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Synchronizing program
+[12:00:38 AM] File change detected. Starting incremental compilation...
+
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+[12:00:42 AM] Found 0 errors. Watching for file changes.
+
+
+
+Program root files: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
+Program options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+Program structureReused: SafeModules
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.d.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/foo.d.ts
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/user/username/projects/myproject/foo.d.ts (used version)
+/user/username/projects/myproject/main.ts (computed .d.ts)
+
+WatchedFiles::
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+/user/username/projects/myproject/tsconfig.json:
+  {"directoryName":"/user/username/projects/myproject/tsconfig.json","inode":10}
+/user/username/projects/myproject/main.ts:
+  {"directoryName":"/user/username/projects/myproject/main.ts","inode":8}
+/user/username/projects/myproject:
+  {"directoryName":"/user/username/projects/myproject","inode":7}
+/a/lib/lib.d.ts:
+  {"directoryName":"/a/lib/lib.d.ts","inode":3}
+/user/username/projects/myproject/foo.d.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.d.ts","inode":13}
+
+FsWatchesRecursive::
+
+exitCode:: ExitStatus.undefined
+
+//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 11
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
index 14593d53c3d50..3e010dd8582e3 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
@@ -50,14 +50,14 @@ WatchedFiles::
   {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/node_modules/@types:
+  {"fileName":"/a/username/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
-/a/username/project/node_modules/@types:
-  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/username/project:
-  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project"}
 /a/username/project/src:
-  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/src"}
 
 FsWatchesRecursive::
 
@@ -101,16 +101,16 @@ WatchedFiles::
   {"fileName":"/a/username/project/tsconfig.json","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/node_modules/@types:
+  {"fileName":"/a/username/project/node_modules/@types","pollingInterval":500}
 /a/username/project/src/file2.ts:
   {"fileName":"/a/username/project/src/file2.ts","pollingInterval":250}
 
 FsWatches::
-/a/username/project/node_modules/@types:
-  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/username/project:
-  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project"}
 /a/username/project/src:
-  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/src"}
 
 FsWatchesRecursive::
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
index c9af5bfe24576..571d2cfcb72c0 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
@@ -97,24 +97,24 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /home/user/projects/myproject/node_modules/reala/package.json:
   {"fileName":"/home/user/projects/myproject/node_modules/reala/package.json","pollingInterval":250}
+/home/user/projects/myproject/node_modules/@types:
+  {"fileName":"/home/user/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /home/user/projects/myproject/src:
-  {"directoryName":"/home/user/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/home/user/projects/myproject/src"}
 /home/user/projects/myproject/node_modules:
-  {"directoryName":"/home/user/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/home/user/projects/myproject/node_modules"}
 /home/user/projects/myproject/node_modules/reala:
-  {"directoryName":"/home/user/projects/myproject/node_modules/reala","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/home/user/projects/myproject/node_modules/reala"}
 /home/user/projects/myproject/node_modules/reala/node_modules:
-  {"directoryName":"/home/user/projects/myproject/node_modules/reala/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/home/user/projects/myproject/node_modules/reala/node_modules"}
 /home/user/projects/myproject/node_modules/realb:
-  {"directoryName":"/home/user/projects/myproject/node_modules/realb","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/home/user/projects/myproject/node_modules/realb"}
 /home/user/projects/myproject/node_modules/realb/node_modules:
-  {"directoryName":"/home/user/projects/myproject/node_modules/realb/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/home/user/projects/myproject/node_modules/@types:
-  {"directoryName":"/home/user/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/home/user/projects/myproject/node_modules/realb/node_modules"}
 /home/user/projects/myproject:
-  {"directoryName":"/home/user/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/home/user/projects/myproject"}
 
 FsWatchesRecursive::
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
index e48000c8b3751..d32ae72a3cf1e 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
@@ -58,16 +58,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 /user/username/projects/myproject/dist:
-  {"directoryName":"/user/username/projects/myproject/dist","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/dist"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 
 FsWatchesRecursive::
 
@@ -101,16 +101,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 /user/username/projects/myproject/dist:
-  {"directoryName":"/user/username/projects/myproject/dist","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/dist"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 
 FsWatchesRecursive::
 
@@ -157,18 +157,18 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file2.ts:
   {"fileName":"/user/username/projects/myproject/src/file2.ts","pollingInterval":250}
 
 FsWatches::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 /user/username/projects/myproject/dist:
-  {"directoryName":"/user/username/projects/myproject/dist","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/dist"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 
 FsWatchesRecursive::
 
@@ -215,18 +215,18 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/renamed.ts:
   {"fileName":"/user/username/projects/myproject/src/renamed.ts","pollingInterval":250}
 
 FsWatches::
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 /user/username/projects/myproject/dist:
-  {"directoryName":"/user/username/projects/myproject/dist","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/dist"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 
 FsWatchesRecursive::
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
index 37fd4927ba263..cf081fb2e345a 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
@@ -60,20 +60,20 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/file2/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/file2/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/file2:
-  {"directoryName":"/user/username/projects/myproject/node_modules/file2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/file2"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 /user/username/projects/myproject/dist:
-  {"directoryName":"/user/username/projects/myproject/dist","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/dist"}
 
 FsWatchesRecursive::
 
@@ -106,20 +106,20 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/file2/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/file2/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/file2:
-  {"directoryName":"/user/username/projects/myproject/node_modules/file2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/file2"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 /user/username/projects/myproject/dist:
-  {"directoryName":"/user/username/projects/myproject/dist","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/dist"}
 
 FsWatchesRecursive::
 
@@ -146,20 +146,20 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/file2/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/file2/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/file2:
-  {"directoryName":"/user/username/projects/myproject/node_modules/file2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/file2"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 /user/username/projects/myproject/dist:
-  {"directoryName":"/user/username/projects/myproject/dist","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/dist"}
 
 FsWatchesRecursive::
 
@@ -202,22 +202,22 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/node_modules/file2/index.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/file2:
-  {"directoryName":"/user/username/projects/myproject/node_modules/file2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/file2"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 /user/username/projects/myproject/dist:
-  {"directoryName":"/user/username/projects/myproject/dist","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/dist"}
 
 FsWatchesRecursive::
 
@@ -250,22 +250,22 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/node_modules/file2/index.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/file2:
-  {"directoryName":"/user/username/projects/myproject/node_modules/file2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/file2"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 /user/username/projects/myproject/dist:
-  {"directoryName":"/user/username/projects/myproject/dist","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/dist"}
 
 FsWatchesRecursive::
 
@@ -287,22 +287,22 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/node_modules/file2/index.d.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/src/file3.ts:
   {"fileName":"/user/username/projects/myproject/src/file3.ts","pollingInterval":250}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/file2:
-  {"directoryName":"/user/username/projects/myproject/node_modules/file2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/file2"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 /user/username/projects/myproject/dist:
-  {"directoryName":"/user/username/projects/myproject/dist","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/dist"}
 
 FsWatchesRecursive::
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
index baaf9b75c86c4..6645dbbe5a516 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
@@ -60,18 +60,18 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/file2/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/file2/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/file2:
-  {"directoryName":"/user/username/projects/myproject/node_modules/file2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/file2"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 
@@ -100,18 +100,18 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/file2/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/file2/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/file2:
-  {"directoryName":"/user/username/projects/myproject/node_modules/file2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/file2"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 
@@ -156,16 +156,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 
@@ -208,16 +208,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 
@@ -237,16 +237,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 
@@ -266,16 +266,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 
@@ -298,16 +298,16 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 
@@ -327,18 +327,18 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 /user/username/projects/myproject/node_modules/file2:
-  {"directoryName":"/user/username/projects/myproject/node_modules/file2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/file2"}
 
 FsWatchesRecursive::
 
@@ -358,18 +358,18 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 /user/username/projects/myproject/node_modules/file2:
-  {"directoryName":"/user/username/projects/myproject/node_modules/file2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/file2"}
 
 FsWatchesRecursive::
 
@@ -411,6 +411,8 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 /user/username/projects/myproject/node_modules/file2/index.d.ts:
   {"fileName":"/user/username/projects/myproject/node_modules/file2/index.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/file2/package.json:
@@ -418,15 +420,13 @@ WatchedFiles::
 
 FsWatches::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 /user/username/projects/myproject/node_modules/file2:
-  {"directoryName":"/user/username/projects/myproject/node_modules/file2","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/file2"}
 
 FsWatchesRecursive::
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
index 2164d2f3e79c5..48df9d0d09b1d 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
@@ -50,14 +50,14 @@ Shape signatures in builder refreshed for::
 /a/b/commonfile2.ts (used version)
 
 WatchedFiles::
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -80,14 +80,14 @@ var zz30 = 100;
 Output::
 
 WatchedFiles::
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -122,14 +122,14 @@ Shape signatures in builder refreshed for::
 /a/b/commonfile2.ts (computed .d.ts)
 
 WatchedFiles::
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
index eeeead92f9366..4afacee3e5a7d 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
@@ -50,14 +50,14 @@ Shape signatures in builder refreshed for::
 /a/b/commonfile2.ts (used version)
 
 WatchedFiles::
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -77,14 +77,14 @@ Input::
 Output::
 
 WatchedFiles::
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -99,14 +99,14 @@ var zz30 = 100;
 Output::
 
 WatchedFiles::
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -141,14 +141,14 @@ Shape signatures in builder refreshed for::
 /a/b/commonfile2.ts (computed .d.ts)
 
 WatchedFiles::
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
@@ -165,14 +165,14 @@ Input::
 Output::
 
 WatchedFiles::
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
index 0f73e756ecd1f..8a4d9817b7fc4 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
@@ -97,9 +97,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -136,9 +136,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
index f389c59be0905..17445c13fa132 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
@@ -92,18 +92,18 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/bar/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/bar:
-  {"directoryName":"/user/username/projects/myproject/node_modules/bar","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/bar"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 
@@ -145,18 +145,18 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/bar/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/bar:
-  {"directoryName":"/user/username/projects/myproject/node_modules/bar","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/bar"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 
@@ -185,18 +185,18 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/bar/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/bar:
-  {"directoryName":"/user/username/projects/myproject/node_modules/bar","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/bar"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
index 6730dd8f5979d..d633c62afa8a6 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
@@ -74,18 +74,18 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/bar/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/bar:
-  {"directoryName":"/user/username/projects/myproject/node_modules/bar","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/bar"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 
@@ -118,18 +118,18 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/bar/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/bar:
-  {"directoryName":"/user/username/projects/myproject/node_modules/bar","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/bar"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 
@@ -158,18 +158,18 @@ WatchedFiles::
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
 /user/username/projects/myproject/node_modules/bar/package.json:
   {"fileName":"/user/username/projects/myproject/node_modules/bar/package.json","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/node_modules/bar:
-  {"directoryName":"/user/username/projects/myproject/node_modules/bar","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules/bar"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 FsWatchesRecursive::
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
index 0a167785511a8..77eb64d93475c 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
@@ -79,9 +79,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -118,9 +118,9 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
index ef32647bc0b20..88d25cde1fcc5 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
@@ -88,18 +88,18 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/main.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -127,18 +127,18 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/main.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
index df999e6b21d36..54ce05a590cbf 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
@@ -68,18 +68,18 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/main.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
@@ -107,18 +107,18 @@ WatchedFiles::
   {"fileName":"/user/username/projects/myproject/src/main.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/myproject/node_modules/@types:
-  {"directoryName":"/user/username/projects/myproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject:
-  {"directoryName":"/user/username/projects/myproject","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js
index 4601f5bda1ed0..880868fe56a4d 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js
@@ -29,7 +29,7 @@ Output::
 
 [12:00:22 AM] Found 0 errors. Watching for file changes.
 
-
+sysLog:: /a/b:: Changing to watchFile
 
 Program root files: ["/a/b/commonFile1.ts","/a/b/commonFile2.ts"]
 Program options: {"watch":true,"project":"/a/b/tsconfig.json","configFilePath":"/a/b/tsconfig.json"}
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js
index 20d001cb9063f..a43e13698624b 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js
@@ -58,12 +58,12 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 FsWatchesRecursive::
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-as-watch-options-to-extend.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-as-watch-options-to-extend.js
index 5cc2b3b89ee19..084d4488fe36a 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-as-watch-options-to-extend.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-as-watch-options-to-extend.js
@@ -50,22 +50,22 @@ Shape signatures in builder refreshed for::
 /a/b/commonfile2.ts (used version)
 
 WatchedFiles::
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/b/tsconfig.json:
-  {"directoryName":"/a/b/tsconfig.json","fallbackPollingInterval":2000,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/tsconfig.json"}
 /a/b/commonfile1.ts:
-  {"directoryName":"/a/b/commonFile1.ts","fallbackPollingInterval":250,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/commonFile1.ts"}
 /a/b/commonfile2.ts:
-  {"directoryName":"/a/b/commonFile2.ts","fallbackPollingInterval":250,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/commonFile2.ts"}
 /a/lib/lib.d.ts:
-  {"directoryName":"/a/lib/lib.d.ts","fallbackPollingInterval":250,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/lib/lib.d.ts"}
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-option.js
index 566566ab08193..039ddc7bc3d5b 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchFile-option.js
@@ -50,22 +50,22 @@ Shape signatures in builder refreshed for::
 /a/b/commonfile2.ts (used version)
 
 WatchedFiles::
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/b/tsconfig.json:
-  {"directoryName":"/a/b/tsconfig.json","fallbackPollingInterval":2000,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/tsconfig.json"}
 /a/b/commonfile1.ts:
-  {"directoryName":"/a/b/commonFile1.ts","fallbackPollingInterval":250,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/commonFile1.ts"}
 /a/b/commonfile2.ts:
-  {"directoryName":"/a/b/commonFile2.ts","fallbackPollingInterval":250,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/commonFile2.ts"}
 /a/lib/lib.d.ts:
-  {"directoryName":"/a/lib/lib.d.ts","fallbackPollingInterval":250,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/lib/lib.d.ts"}
 
 FsWatchesRecursive::
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/loads-missing-files-from-disk.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/loads-missing-files-from-disk.js
index 9227eb075d00e..0a011219ac546 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/loads-missing-files-from-disk.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/loads-missing-files-from-disk.js
@@ -30,7 +30,7 @@ getSemanticDiagnostics:: /c/foo.ts:: 1
 foo.ts(1,17): error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 fileExists:: [{"key":"/c/tsconfig.json","count":1},{"key":"/c/jsconfig.json","count":1},{"key":"/tsconfig.json","count":1},{"key":"/jsconfig.json","count":1},{"key":"/c/bar.ts","count":1},{"key":"/c/bar.tsx","count":1},{"key":"/c/bar.d.ts","count":1},{"key":"/bar.ts","count":1},{"key":"/bar.tsx","count":1},{"key":"/bar.d.ts","count":1},{"key":"/c/bar.js","count":1},{"key":"/c/bar.jsx","count":1},{"key":"/bar.js","count":1},{"key":"/bar.jsx","count":1},{"key":"/c/package.json","count":1},{"key":"/package.json","count":1}]
-directoryExists:: [{"key":"/c","count":2},{"key":"/","count":2},{"key":"/c/node_modules","count":1},{"key":"/node_modules","count":1},{"key":"/c/node_modules/@types","count":1},{"key":"/node_modules/@types","count":1}]
+directoryExists:: [{"key":"/c","count":3},{"key":"/","count":2},{"key":"/c/node_modules","count":2},{"key":"/node_modules","count":1},{"key":"/c/node_modules/@types","count":2},{"key":"/node_modules/@types","count":1}]
 getDirectories:: []
 readFile:: [{"key":"/c/foo.ts","count":1}]
 readDirectory:: []
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeout-occurs-after-installation.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeout-occurs-after-installation.js
index 863afe7d9d8a4..1857d140c27ca 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeout-occurs-after-installation.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeout-occurs-after-installation.js
@@ -51,6 +51,9 @@ Open files:
 DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
 DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
 Scheduled: *ensureProjectForOpenFiles*
@@ -244,6 +247,11 @@ Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled ea
 Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
 DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeouts-occur-inbetween-installation.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeouts-occur-inbetween-installation.js
index ad8dd6172e475..a00e2c4e52be9 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeouts-occur-inbetween-installation.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/npm-install-in-directory-with-tsconfig-timeouts-occur-inbetween-installation.js
@@ -51,6 +51,9 @@ Open files:
 DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
 DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b 1 undefined Config: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Wild card directory
 Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json
 Scheduled: *ensureProjectForOpenFiles*
@@ -268,6 +271,11 @@ Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled ea
 Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
 Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.json, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules/@types 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Type roots
 DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /user/username/rootfolder/otherfolder/a/b/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/@types :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/tsconfig.json WatchType: Failed Lookup Locations
diff --git a/tests/baselines/reference/tsserver/cachingFileSystemInformation/works-using-legacy-resolution-logic.js b/tests/baselines/reference/tsserver/cachingFileSystemInformation/works-using-legacy-resolution-logic.js
index 36d082cf22a45..210ef95208e71 100644
--- a/tests/baselines/reference/tsserver/cachingFileSystemInformation/works-using-legacy-resolution-logic.js
+++ b/tests/baselines/reference/tsserver/cachingFileSystemInformation/works-using-legacy-resolution-logic.js
@@ -57,7 +57,7 @@ Project '/dev/null/inferredProject1*' (Inferred)
 -----------------------------------------------
 Could not find source file: '/c/f1.ts'.
 fileExists:: [{"key":"/c/d/f2.ts","count":1},{"key":"/c/d/f2.tsx","count":1},{"key":"/c/d/f2.d.ts","count":1},{"key":"/c/f2.ts","count":1},{"key":"/c/f2.tsx","count":1},{"key":"/c/f2.d.ts","count":1},{"key":"/f2.ts","count":1},{"key":"/f2.tsx","count":1},{"key":"/f2.d.ts","count":1},{"key":"/c/d/f2.js","count":1},{"key":"/c/d/f2.jsx","count":1},{"key":"/c/f2.js","count":1},{"key":"/c/f2.jsx","count":1},{"key":"/f2.js","count":1},{"key":"/f2.jsx","count":1}]
-directoryExists:: [{"key":"/c/d","count":2},{"key":"/c","count":2},{"key":"/","count":2},{"key":"/c/d/node_modules","count":1},{"key":"/c/node_modules","count":1},{"key":"/node_modules","count":1},{"key":"/c/d/node_modules/@types","count":1},{"key":"/c/node_modules/@types","count":1},{"key":"/node_modules/@types","count":1}]
+directoryExists:: [{"key":"/c/d","count":2},{"key":"/c","count":2},{"key":"/","count":2},{"key":"/c/d/node_modules","count":2},{"key":"/c/node_modules","count":1},{"key":"/node_modules","count":1},{"key":"/c/d/node_modules/@types","count":1},{"key":"/c/node_modules/@types","count":1},{"key":"/node_modules/@types","count":1}]
 getDirectories:: []
 readFile:: []
 readDirectory:: []
@@ -102,7 +102,7 @@ getSemanticDiagnostics:: /c/f1.ts:: 1
 ../f1.ts(1,1): error TS2304: Cannot find name 'foo'.
 
 fileExists:: [{"key":"/c/d/f1.ts","count":1},{"key":"/c/d/f1.tsx","count":1},{"key":"/c/d/f1.d.ts","count":1},{"key":"/c/f1.ts","count":1}]
-directoryExists:: [{"key":"/c/d","count":1},{"key":"/c","count":1},{"key":"/c/d/node_modules/@types","count":1},{"key":"/c/node_modules/@types","count":1},{"key":"/node_modules/@types","count":1}]
+directoryExists:: [{"key":"/c/d","count":2},{"key":"/c","count":1},{"key":"/c/d/node_modules/@types","count":2},{"key":"/c/node_modules/@types","count":1},{"key":"/node_modules/@types","count":1}]
 getDirectories:: []
 readFile:: []
 readDirectory:: []
\ No newline at end of file
diff --git a/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-after-installation.js b/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-after-installation.js
index 584478548a45f..87ac21243b97b 100644
--- a/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-after-installation.js
+++ b/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-after-installation.js
@@ -65,6 +65,9 @@ event:
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Scheduled: /user/username/projects/myproject/tsconfig.json
 Scheduled: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-inbetween-installation.js b/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-inbetween-installation.js
index 9fb71d1254428..04b27e4d6d2b9 100644
--- a/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-inbetween-installation.js
+++ b/tests/baselines/reference/tsserver/projectErrors/npm-install-when-timeout-occurs-inbetween-installation.js
@@ -65,6 +65,9 @@ event:
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/projects/myproject/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Project: /user/username/projects/myproject/tsconfig.json WatchType: Failed Lookup Locations
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules :: WatchInfo: /user/username/projects/myproject 1 undefined Config: /user/username/projects/myproject/tsconfig.json WatchType: Wild card directory
 Scheduled: /user/username/projects/myproject/tsconfig.json
 Scheduled: *ensureProjectForOpenFiles*
diff --git a/tests/baselines/reference/tsserver/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-not-at-root-level.js b/tests/baselines/reference/tsserver/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-not-at-root-level.js
index f7d5b06d246c3..5d8e4e13b9b4d 100644
--- a/tests/baselines/reference/tsserver/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-not-at-root-level.js
+++ b/tests/baselines/reference/tsserver/projectUpdatedInBackground/when-event-handler-is-set-in-the-session-and-project-is-not-at-root-level.js
@@ -80,6 +80,9 @@ Open files:
 DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
diff --git a/tests/baselines/reference/tsserver/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js b/tests/baselines/reference/tsserver/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
index 0afb1f68ffb19..aab46a168d33b 100644
--- a/tests/baselines/reference/tsserver/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
+++ b/tests/baselines/reference/tsserver/projectUpdatedInBackground/with-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
@@ -91,6 +91,9 @@ event:
 DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
diff --git a/tests/baselines/reference/tsserver/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js b/tests/baselines/reference/tsserver/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
index c8b66d92914f4..c1dde605e1caa 100644
--- a/tests/baselines/reference/tsserver/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
+++ b/tests/baselines/reference/tsserver/projectUpdatedInBackground/without-noGetErrOnBackgroundUpdate-and-project-is-not-at-root-level.js
@@ -91,6 +91,9 @@ event:
 DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/rootfolder/otherfolder/a/b/node_modules/file2.d.ts :: WatchInfo: /user/username/rootfolder/otherfolder/a/b/node_modules 1 undefined Project: /user/username/rootfolder/otherfolder/a/b/project/tsconfig.json WatchType: Failed Lookup Locations
diff --git a/tests/baselines/reference/tsserver/resolutionCache/npm-install-@types-works.js b/tests/baselines/reference/tsserver/resolutionCache/npm-install-@types-works.js
index a8baf59905f81..c0a13959a1ee2 100644
--- a/tests/baselines/reference/tsserver/resolutionCache/npm-install-@types-works.js
+++ b/tests/baselines/reference/tsserver/resolutionCache/npm-install-@types-works.js
@@ -45,11 +45,19 @@ event:
 DirectoryWatcher:: Triggered with /a/b/projects/temp/node_modules :: WatchInfo: /a/b/projects/temp/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Scheduled: /dev/null/inferredProject1*FailedLookupInvalidation
 Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/projects/temp/node_modules :: WatchInfo: /a/b/projects/temp/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /a/b/projects/temp/node_modules :: WatchInfo: /a/b/projects/temp/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
+Scheduled: /dev/null/inferredProject1*FailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/projects/temp/node_modules :: WatchInfo: /a/b/projects/temp/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 DirectoryWatcher:: Triggered with /a/b/projects/temp/node_modules/@types :: WatchInfo: /a/b/projects/temp/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 Scheduled: /dev/null/inferredProject1*
 Scheduled: *ensureProjectForOpenFiles*
 Scheduled: /dev/null/inferredProject1*FailedLookupInvalidation, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/projects/temp/node_modules/@types :: WatchInfo: /a/b/projects/temp/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+DirectoryWatcher:: Triggered with /a/b/projects/temp/node_modules/@types :: WatchInfo: /a/b/projects/temp/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
+Scheduled: /dev/null/inferredProject1*, Cancelled earlier one
+Scheduled: *ensureProjectForOpenFiles*, Cancelled earlier one
+Scheduled: /dev/null/inferredProject1*FailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/projects/temp/node_modules/@types :: WatchInfo: /a/b/projects/temp/node_modules/@types 1 undefined Project: /dev/null/inferredProject1* WatchType: Type roots
 DirectoryWatcher:: Triggered with /a/b/projects/temp/node_modules/@types :: WatchInfo: /a/b/projects/temp/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
 Scheduled: /dev/null/inferredProject1*FailedLookupInvalidation, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /a/b/projects/temp/node_modules/@types :: WatchInfo: /a/b/projects/temp/node_modules 1 undefined Project: /dev/null/inferredProject1* WatchType: Failed Lookup Locations
diff --git a/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-compiles-from-sources.js b/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-compiles-from-sources.js
index cb3c63b45f1cb..4973e531e3962 100644
--- a/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-compiles-from-sources.js
+++ b/tests/baselines/reference/tsserver/symLinks/module-resolution-when-project-compiles-from-sources.js
@@ -77,6 +77,9 @@ event:
 DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
 Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@microsoft :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@microsoft :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
diff --git a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-compiles-from-sources.js b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-compiles-from-sources.js
index d7f9852e16033..e7018eb8e7711 100644
--- a/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-compiles-from-sources.js
+++ b/tests/baselines/reference/tsserver/symLinks/module-resolution-with-path-mapping-when-project-compiles-from-sources.js
@@ -89,6 +89,9 @@ event:
 DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation
 Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
+DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
+Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@microsoft :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
 Scheduled: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.jsonFailedLookupInvalidation, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules/@microsoft :: WatchInfo: /users/username/projects/myproject/javascript/packages/recognizers-date-time/node_modules 1 undefined Project: /users/username/projects/myproject/javascript/packages/recognizers-date-time/tsconfig.json WatchType: Failed Lookup Locations
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options-in-host-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options-in-host-configuration.js
index 9e3f0fcc1e202..a76600a1ca517 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options-in-host-configuration.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options-in-host-configuration.js
@@ -47,4 +47,4 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options.js b/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options.js
index 92afe44b7ed76..24e4d6cdd6c8e 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/external-project-watch-options.js
@@ -47,6 +47,6 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/files-at-root.js b/tests/baselines/reference/tsserver/watchEnvironment/files-at-root.js
index fa47642a988b0..eab247c6dd0e9 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/files-at-root.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/files-at-root.js
@@ -50,11 +50,11 @@ c:/project/file2.ts:
   {"fileName":"c:/project/file2.ts","pollingInterval":250}
 c:/a/lib/lib.d.ts:
   {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+c:/project/node_modules/@types:
+  {"fileName":"c:/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 c:/project:
-  {"directoryName":"c:/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-c:/project/node_modules/@types:
-  {"directoryName":"c:/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"c:/project"}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/files-at-windows-style-root.js b/tests/baselines/reference/tsserver/watchEnvironment/files-at-windows-style-root.js
index fa47642a988b0..eab247c6dd0e9 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/files-at-windows-style-root.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/files-at-windows-style-root.js
@@ -50,11 +50,11 @@ c:/project/file2.ts:
   {"fileName":"c:/project/file2.ts","pollingInterval":250}
 c:/a/lib/lib.d.ts:
   {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+c:/project/node_modules/@types:
+  {"fileName":"c:/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 c:/project:
-  {"directoryName":"c:/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-c:/project/node_modules/@types:
-  {"directoryName":"c:/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"c:/project"}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-root.js b/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-root.js
index 91486537af12f..d966be43edcf7 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-root.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-root.js
@@ -52,13 +52,13 @@ c:/myfolder/allproject/project/file2.ts:
   {"fileName":"c:/myfolder/allproject/project/file2.ts","pollingInterval":250}
 c:/a/lib/lib.d.ts:
   {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+c:/myfolder/allproject/project/node_modules/@types:
+  {"fileName":"c:/myfolder/allproject/project/node_modules/@types","pollingInterval":500}
+c:/myfolder/allproject/node_modules/@types:
+  {"fileName":"c:/myfolder/allproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 c:/myfolder/allproject/project:
-  {"directoryName":"c:/myfolder/allproject/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-c:/myfolder/allproject/project/node_modules/@types:
-  {"directoryName":"c:/myfolder/allproject/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-c:/myfolder/allproject/node_modules/@types:
-  {"directoryName":"c:/myfolder/allproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"c:/myfolder/allproject/project"}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-windows-style-root.js b/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-windows-style-root.js
index 91486537af12f..d966be43edcf7 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-windows-style-root.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/files-not-at-windows-style-root.js
@@ -52,13 +52,13 @@ c:/myfolder/allproject/project/file2.ts:
   {"fileName":"c:/myfolder/allproject/project/file2.ts","pollingInterval":250}
 c:/a/lib/lib.d.ts:
   {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+c:/myfolder/allproject/project/node_modules/@types:
+  {"fileName":"c:/myfolder/allproject/project/node_modules/@types","pollingInterval":500}
+c:/myfolder/allproject/node_modules/@types:
+  {"fileName":"c:/myfolder/allproject/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
 c:/myfolder/allproject/project:
-  {"directoryName":"c:/myfolder/allproject/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-c:/myfolder/allproject/project/node_modules/@types:
-  {"directoryName":"c:/myfolder/allproject/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-c:/myfolder/allproject/node_modules/@types:
-  {"directoryName":"c:/myfolder/allproject/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"c:/myfolder/allproject/project"}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options-in-host-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options-in-host-configuration.js
index a483b20eca2b2..12bef2d424d2b 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options-in-host-configuration.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options-in-host-configuration.js
@@ -56,4 +56,4 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options.js b/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options.js
index 520b052373644..ae74ecb6e3fb7 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/inferred-project-watch-options.js
@@ -56,6 +56,6 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names-with-i.js b/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names-with-i.js
index 93d609f4f7926..ada11a9f9cce4 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names-with-i.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names-with-i.js
@@ -37,11 +37,11 @@ WatchedFiles::
   {"fileName":"/User/userName/Projects/i/jsconfig.json","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/i/node_modules:
+  {"fileName":"/User/userName/Projects/i/node_modules","pollingInterval":500}
+/user/username/projects/i/node_modules/@types:
+  {"fileName":"/User/userName/Projects/i/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/i/node_modules:
-  {"directoryName":"/User/userName/Projects/i/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/i/node_modules/@types:
-  {"directoryName":"/User/userName/Projects/i/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names.js b/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names.js
index 66595cfcd6c95..80792d4de2667 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/project-with-ascii-file-names.js
@@ -37,11 +37,11 @@ WatchedFiles::
   {"fileName":"/User/userName/Projects/I/jsconfig.json","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/i/node_modules:
+  {"fileName":"/User/userName/Projects/I/node_modules","pollingInterval":500}
+/user/username/projects/i/node_modules/@types:
+  {"fileName":"/User/userName/Projects/I/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/i/node_modules:
-  {"directoryName":"/User/userName/Projects/I/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/i/node_modules/@types:
-  {"directoryName":"/User/userName/Projects/I/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/project-with-unicode-file-names.js b/tests/baselines/reference/tsserver/watchEnvironment/project-with-unicode-file-names.js
index 23f826fb03efc..8a6d9091c80a7 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/project-with-unicode-file-names.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/project-with-unicode-file-names.js
@@ -37,11 +37,11 @@ WatchedFiles::
   {"fileName":"/User/userName/Projects/İ/jsconfig.json","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/user/username/projects/İ/node_modules:
+  {"fileName":"/User/userName/Projects/İ/node_modules","pollingInterval":500}
+/user/username/projects/İ/node_modules/@types:
+  {"fileName":"/User/userName/Projects/İ/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-/user/username/projects/İ/node_modules:
-  {"directoryName":"/User/userName/Projects/İ/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/user/username/projects/İ/node_modules/@types:
-  {"directoryName":"/User/userName/Projects/İ/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js b/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js
index 458dc2e274a6f..d7fc0ab349770 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js
@@ -54,16 +54,16 @@ WatchedFiles::
   {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/node_modules/@types:
+  {"fileName":"/a/username/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/username/project:
-  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project"}
 /a/username/project/node_modules:
-  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/node_modules"}
 /a/username/project/src:
-  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/username/project/node_modules/@types:
-  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/src"}
 
 FsWatchesRecursive::
 
@@ -74,16 +74,16 @@ WatchedFiles::
   {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/node_modules/@types:
+  {"fileName":"/a/username/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/username/project:
-  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project"}
 /a/username/project/node_modules:
-  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/node_modules"}
 /a/username/project/src:
-  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/username/project/node_modules/@types:
-  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/src"}
 
 FsWatchesRecursive::
 
@@ -94,16 +94,16 @@ WatchedFiles::
   {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/node_modules/@types:
+  {"fileName":"/a/username/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/username/project:
-  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project"}
 /a/username/project/node_modules:
-  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/node_modules"}
 /a/username/project/src:
-  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/username/project/node_modules/@types:
-  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/src"}
 
 FsWatchesRecursive::
 
@@ -114,16 +114,16 @@ WatchedFiles::
   {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/node_modules/@types:
+  {"fileName":"/a/username/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/username/project:
-  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project"}
 /a/username/project/node_modules:
-  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/node_modules"}
 /a/username/project/src:
-  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/username/project/node_modules/@types:
-  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/src"}
 
 FsWatchesRecursive::
 
@@ -134,16 +134,16 @@ WatchedFiles::
   {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/node_modules/@types:
+  {"fileName":"/a/username/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/username/project:
-  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project"}
 /a/username/project/node_modules:
-  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/node_modules"}
 /a/username/project/src:
-  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/username/project/node_modules/@types:
-  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/src"}
 
 FsWatchesRecursive::
 
@@ -154,16 +154,16 @@ WatchedFiles::
   {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/node_modules/@types:
+  {"fileName":"/a/username/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/username/project:
-  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project"}
 /a/username/project/node_modules:
-  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/node_modules"}
 /a/username/project/src:
-  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/username/project/node_modules/@types:
-  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/src"}
 
 FsWatchesRecursive::
 
@@ -174,15 +174,15 @@ WatchedFiles::
   {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/node_modules/@types:
+  {"fileName":"/a/username/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/username/project:
-  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project"}
 /a/username/project/node_modules:
-  {"directoryName":"/a/username/project/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/node_modules"}
 /a/username/project/src:
-  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/username/project/node_modules/@types:
-  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/src"}
 
 FsWatchesRecursive::
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js
index f70281424f0a5..d1a1ce22a95e6 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js
@@ -59,14 +59,14 @@ WatchedFiles::
   {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/node_modules/@types:
+  {"fileName":"/a/username/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/username/project:
-  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project"}
 /a/username/project/src:
-  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/username/project/node_modules/@types:
-  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/src"}
 
 FsWatchesRecursive::
 
@@ -125,15 +125,15 @@ WatchedFiles::
   {"fileName":"/a/username/project/src/file1.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/username/project/node_modules/@types:
+  {"fileName":"/a/username/project/node_modules/@types","pollingInterval":500}
 /a/username/project/src/file2.ts:
   {"fileName":"/a/username/project/src/file2.ts","pollingInterval":250}
 
 FsWatches::
 /a/username/project:
-  {"directoryName":"/a/username/project","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project"}
 /a/username/project/src:
-  {"directoryName":"/a/username/project/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/username/project/node_modules/@types:
-  {"directoryName":"/a/username/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/username/project/src"}
 
 FsWatchesRecursive::
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js b/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js
index 33a2374bba5ab..5906c042eb1ee 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/watching-files-with-network-style-paths.js
@@ -36,12 +36,12 @@ c:/myprojects/project/jsconfig.json:
   {"fileName":"c:/myprojects/project/jsconfig.json","pollingInterval":250}
 c:/a/lib/lib.d.ts:
   {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+c:/myprojects/project/node_modules/@types:
+  {"fileName":"c:/myprojects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-c:/myprojects/project/node_modules/@types:
-  {"directoryName":"c:/myprojects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 For files of style //vda1cs4850/myprojects/project/x.js
 Provided types map file "/typesMap.json" doesn't exist
@@ -81,12 +81,12 @@ WatchedFiles::
   {"fileName":"//vda1cs4850/myprojects/project/jsconfig.json","pollingInterval":250}
 //vda1cs4850/a/lib/lib.d.ts:
   {"fileName":"//vda1cs4850/a/lib/lib.d.ts","pollingInterval":250}
+//vda1cs4850/myprojects/project/node_modules/@types:
+  {"fileName":"//vda1cs4850/myprojects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-//vda1cs4850/myprojects/project/node_modules/@types:
-  {"directoryName":"//vda1cs4850/myprojects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 For files of style //vda1cs4850/c$/myprojects/project/x.js
 Provided types map file "/typesMap.json" doesn't exist
@@ -126,12 +126,12 @@ WatchedFiles::
   {"fileName":"//vda1cs4850/c$/myprojects/project/jsconfig.json","pollingInterval":250}
 //vda1cs4850/a/lib/lib.d.ts:
   {"fileName":"//vda1cs4850/a/lib/lib.d.ts","pollingInterval":250}
+//vda1cs4850/c$/myprojects/project/node_modules/@types:
+  {"fileName":"//vda1cs4850/c$/myprojects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-//vda1cs4850/c$/myprojects/project/node_modules/@types:
-  {"directoryName":"//vda1cs4850/c$/myprojects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 For files of style c:/users/username/myprojects/project/x.js
 Provided types map file "/typesMap.json" doesn't exist
@@ -171,12 +171,12 @@ c:/users/username/myprojects/project/jsconfig.json:
   {"fileName":"c:/users/username/myprojects/project/jsconfig.json","pollingInterval":250}
 c:/a/lib/lib.d.ts:
   {"fileName":"c:/a/lib/lib.d.ts","pollingInterval":250}
+c:/users/username/myprojects/project/node_modules/@types:
+  {"fileName":"c:/users/username/myprojects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-c:/users/username/myprojects/project/node_modules/@types:
-  {"directoryName":"c:/users/username/myprojects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
 
 For files of style //vda1cs4850/c$/users/username/myprojects/project/x.js
 Provided types map file "/typesMap.json" doesn't exist
@@ -216,9 +216,9 @@ WatchedFiles::
   {"fileName":"//vda1cs4850/c$/users/username/myprojects/project/jsconfig.json","pollingInterval":250}
 //vda1cs4850/a/lib/lib.d.ts:
   {"fileName":"//vda1cs4850/a/lib/lib.d.ts","pollingInterval":250}
+//vda1cs4850/c$/users/username/myprojects/project/node_modules/@types:
+  {"fileName":"//vda1cs4850/c$/users/username/myprojects/project/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 
 FsWatchesRecursive::
-//vda1cs4850/c$/users/username/myprojects/project/node_modules/@types:
-  {"directoryName":"//vda1cs4850/c$/users/username/myprojects/project/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configFile.js b/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configFile.js
index 27950d4a218b1..fbc151f36639c 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configFile.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configFile.js
@@ -65,7 +65,7 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
+  {"directoryName":"/user/username/projects/myproject/src"}
 /user/username/projects/myproject/node_modules:
-  {"directoryName":"/user/username/projects/myproject/node_modules","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/node_modules"}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configuration.js
index e435ad87bd0dc..b3ac931bf7e50 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configuration.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configuration.js
@@ -65,5 +65,5 @@ FsWatches::
 
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-  {"directoryName":"/user/username/projects/myproject/src","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/user/username/projects/myproject/src"}
+  {"directoryName":"/user/username/projects/myproject/src"}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-as-host-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-as-host-configuration.js
index 90cdf93cc6c3f..625804c116732 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-as-host-configuration.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-as-host-configuration.js
@@ -57,11 +57,11 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 FsWatchesRecursive::
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-in-configFile.js b/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-in-configFile.js
index 466c000fc243b..5a20fe6e504d4 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-in-configFile.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-watchDirectory-option-in-configFile.js
@@ -57,11 +57,11 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
 
 FsWatchesRecursive::
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-as-host-configuration.js b/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-as-host-configuration.js
index 0ce74334fc9de..34fc42bd5fa78 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-as-host-configuration.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-as-host-configuration.js
@@ -51,17 +51,17 @@ Open files:
 		Projects: /a/b/tsconfig.json
 response:{"responseRequired":false}
 WatchedFiles::
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/b/tsconfig.json:
-  {"directoryName":"/a/b/tsconfig.json","fallbackPollingInterval":2000,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/tsconfig.json"}
 /a/b/commonfile2.ts:
-  {"directoryName":"/a/b/commonFile2.ts","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/commonFile2.ts"}
 /a/lib/lib.d.ts:
-  {"directoryName":"/a/lib/lib.d.ts","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/lib/lib.d.ts"}
 
 FsWatchesRecursive::
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}
diff --git a/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-in-configFile.js b/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-in-configFile.js
index b7aecd0a11db1..36b83c2e6af07 100644
--- a/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-in-configFile.js
+++ b/tests/baselines/reference/tsserver/watchEnvironment/with-watchFile-option-in-configFile.js
@@ -55,13 +55,13 @@ WatchedFiles::
   {"fileName":"/a/b/commonFile2.ts","pollingInterval":250}
 /a/lib/lib.d.ts:
   {"fileName":"/a/lib/lib.d.ts","pollingInterval":250}
+/a/b/node_modules/@types:
+  {"fileName":"/a/b/node_modules/@types","pollingInterval":500}
 
 FsWatches::
 /a/b/tsconfig.json:
-  {"directoryName":"/a/b/tsconfig.json","fallbackPollingInterval":2000,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b/tsconfig.json"}
 
 FsWatchesRecursive::
 /a/b:
-  {"directoryName":"/a/b","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
-/a/b/node_modules/@types:
-  {"directoryName":"/a/b/node_modules/@types","fallbackPollingInterval":500,"fallbackOptions":{"watchFile":"PriorityPollingInterval"}}
+  {"directoryName":"/a/b"}

From 460f2a898c983af5b2f7b129830ee4a39c990d81 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Mon, 2 May 2022 14:24:56 -0700
Subject: [PATCH 03/15] Refactor for simpler tests

---
 src/harness/virtualFileSystemWithWatch.ts     | 52 ++-----------------
 .../unittests/tsbuildWatch/noEmit.ts          |  3 +-
 .../forceConsistentCasingInFileNames.ts       |  2 +-
 src/testRunner/unittests/tsserver/helpers.ts  |  2 +-
 ...n-no-files-are-emitted-with-incremental.js | 26 +++++-----
 ...when-watching-when-no-files-are-emitted.js | 26 +++++-----
 6 files changed, 32 insertions(+), 79 deletions(-)

diff --git a/src/harness/virtualFileSystemWithWatch.ts b/src/harness/virtualFileSystemWithWatch.ts
index 90763f7cf62c1..8830e1cb01ac9 100644
--- a/src/harness/virtualFileSystemWithWatch.ts
+++ b/src/harness/virtualFileSystemWithWatch.ts
@@ -14,18 +14,6 @@ interface String { charAt: any; }
 interface Array<T> { length: number; [n: number]: T; }`
     };
 
-    export const safeList = {
-        path: "/safeList.json" as Path,
-        content: JSON.stringify({
-            commander: "commander",
-            express: "express",
-            jquery: "jquery",
-            lodash: "lodash",
-            moment: "moment",
-            chroma: "chroma-js"
-        })
-    };
-
     function getExecutingFilePathFromLibFile(): string {
         return combinePaths(getDirectoryPath(libFile.path), "tsc.js");
     }
@@ -43,11 +31,11 @@ interface Array<T> { length: number; [n: number]: T; }`
     }
 
     export function createWatchedSystem(fileOrFolderList: readonly FileOrFolderOrSymLink[], params?: TestServerHostCreationParameters): TestServerHost {
-        return new TestServerHost(/*withSafelist*/ false, fileOrFolderList, params);
+        return new TestServerHost(fileOrFolderList, params);
     }
 
     export function createServerHost(fileOrFolderList: readonly FileOrFolderOrSymLink[], params?: TestServerHostCreationParameters): TestServerHost {
-        const host = new TestServerHost(/*withSafelist*/ true, fileOrFolderList, params);
+        const host = new TestServerHost(fileOrFolderList, params);
         // Just like sys, patch the host to use writeFile
         patchWriteFileEnsuringDirectory(host);
         return host;
@@ -338,7 +326,6 @@ interface Array<T> { length: number; [n: number]: T; }`
         private readonly inodes?: ESMap<Path, number>;
         watchDirectory: HostWatchDirectory;
         constructor(
-            public withSafeList: boolean,
             fileOrFolderorSymLinkList: readonly FileOrFolderOrSymLink[],
             {
                 useCaseSensitiveFileNames, executingFilePath, currentDirectory,
@@ -430,7 +417,6 @@ interface Array<T> { length: number; [n: number]: T; }`
 
         private reloadFS(fileOrFolderOrSymLinkList: readonly FileOrFolderOrSymLink[]) {
             Debug.assert(this.fs.size === 0);
-            fileOrFolderOrSymLinkList = fileOrFolderOrSymLinkList.concat(this.withSafeList ? safeList : []);
             const filesOrFoldersToLoad: readonly FileOrFolderOrSymLink[] = !this.windowsStyleRoot ? fileOrFolderOrSymLinkList :
                 fileOrFolderOrSymLinkList.map<FileOrFolderOrSymLink>(f => {
                     const result = clone(f);
@@ -438,39 +424,7 @@ interface Array<T> { length: number; [n: number]: T; }`
                     return result;
                 });
             for (const fileOrDirectory of filesOrFoldersToLoad) {
-                const path = this.toFullPath(fileOrDirectory.path);
-                // If its a change
-                const currentEntry = this.fs.get(path);
-                if (currentEntry) {
-                    if (isFsFile(currentEntry)) {
-                        if (isFile(fileOrDirectory)) {
-                            // Update file
-                            if (currentEntry.content !== fileOrDirectory.content) {
-                                this.modifyFile(fileOrDirectory.path, fileOrDirectory.content);
-                            }
-                        }
-                        else {
-                            // TODO: Changing from file => folder/Symlink
-                        }
-                    }
-                    else if (isFsSymLink(currentEntry)) {
-                        // TODO: update symlinks
-                    }
-                    else {
-                        // Folder
-                        if (isFile(fileOrDirectory)) {
-                            // TODO: Changing from folder => file
-                        }
-                        else {
-                            // Folder update: Nothing to do.
-                            currentEntry.modifiedTime = this.now();
-                            this.invokeFsWatches(currentEntry.fullPath, "change");
-                        }
-                    }
-                }
-                else {
-                    this.ensureFileOrFolder(fileOrDirectory);
-                }
+                this.ensureFileOrFolder(fileOrDirectory);
             }
         }
 
diff --git a/src/testRunner/unittests/tsbuildWatch/noEmit.ts b/src/testRunner/unittests/tsbuildWatch/noEmit.ts
index ddcf1dd0b2893..456bfe3614478 100644
--- a/src/testRunner/unittests/tsbuildWatch/noEmit.ts
+++ b/src/testRunner/unittests/tsbuildWatch/noEmit.ts
@@ -6,11 +6,10 @@ namespace ts.tscWatch {
             commandLineArgs: ["-b", "-w", "-verbose"],
             sys: () => createWatchedSystem(
                 [
-                    libFile,
+                    { path: libFile.path, content: libContent },
                     { path: `${projectRoot}/a.js`, content: "" },
                     { path: `${projectRoot}/b.ts`, content: "" },
                     { path: `${projectRoot}/tsconfig.json`, content: JSON.stringify({ compilerOptions: { allowJs: true, noEmit: true } }) },
-                    { path: libFile.path, content: libContent }
                 ],
                 { currentDirectory: projectRoot }
             ),
diff --git a/src/testRunner/unittests/tscWatch/forceConsistentCasingInFileNames.ts b/src/testRunner/unittests/tscWatch/forceConsistentCasingInFileNames.ts
index 5199b780b06e3..60a989f2fa397 100644
--- a/src/testRunner/unittests/tscWatch/forceConsistentCasingInFileNames.ts
+++ b/src/testRunner/unittests/tscWatch/forceConsistentCasingInFileNames.ts
@@ -20,7 +20,7 @@ namespace ts.tscWatch {
                 scenario: "forceConsistentCasingInFileNames",
                 subScenario,
                 commandLineArgs: ["--w", "--p", tsconfig.path],
-                sys: () => createWatchedSystem([loggerFile, anotherFile, tsconfig, libFile, tsconfig]),
+                sys: () => createWatchedSystem([loggerFile, anotherFile, tsconfig, libFile]),
                 changes
             });
         }
diff --git a/src/testRunner/unittests/tsserver/helpers.ts b/src/testRunner/unittests/tsserver/helpers.ts
index 0cf7b4c41d801..de36860b09c42 100644
--- a/src/testRunner/unittests/tsserver/helpers.ts
+++ b/src/testRunner/unittests/tsserver/helpers.ts
@@ -145,7 +145,7 @@ namespace ts.projectSystem {
             installTypingHost: server.ServerHost,
             readonly typesRegistry = new Map<string, MapLike<string>>(),
             log?: TI.Log) {
-            super(installTypingHost, globalTypingsCacheLocation, TestFSWithWatch.safeList.path, customTypesMap.path, throttleLimit, log);
+            super(installTypingHost, globalTypingsCacheLocation, "/safeList.json" as Path, customTypesMap.path, throttleLimit, log);
         }
 
         protected postExecActions: PostExecAction[] = [];
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
index d65dcbdb946d5..02b66ff4809e5 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
@@ -27,16 +27,16 @@ declare const console: { log(msg: any): void; };
 /a/lib/tsc.js -b -w -verbose --incremental
 Output::
 >> Screen clear
-[12:00:25 AM] Starting compilation in watch mode...
+[12:00:23 AM] Starting compilation in watch mode...
 
-[12:00:26 AM] Projects in this build: 
+[12:00:24 AM] Projects in this build: 
     * tsconfig.json
 
-[12:00:27 AM] Project 'tsconfig.json' is out of date because oldest output 'a.js' is older than newest input 'b.ts'
+[12:00:25 AM] Project 'tsconfig.json' is out of date because oldest output 'a.js' is older than newest input 'b.ts'
 
-[12:00:28 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
+[12:00:26 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[12:00:33 AM] Found 0 errors. Watching for file changes.
+[12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -130,13 +130,13 @@ Input::
 
 Output::
 >> Screen clear
-[12:00:37 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
-[12:00:38 AM] Project 'tsconfig.json' is out of date because output file 'b.js' does not exist
+[12:00:36 AM] Project 'tsconfig.json' is out of date because output file 'b.js' does not exist
 
-[12:00:39 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
+[12:00:37 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[12:00:40 AM] Found 0 errors. Watching for file changes.
+[12:00:38 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -178,13 +178,13 @@ const x = 10;
 
 Output::
 >> Screen clear
-[12:00:44 AM] File change detected. Starting incremental compilation...
+[12:00:42 AM] File change detected. Starting incremental compilation...
 
-[12:00:45 AM] Project 'tsconfig.json' is out of date because output file 'b.js' does not exist
+[12:00:43 AM] Project 'tsconfig.json' is out of date because output file 'b.js' does not exist
 
-[12:00:46 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
+[12:00:44 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[12:00:53 AM] Found 0 errors. Watching for file changes.
+[12:00:51 AM] Found 0 errors. Watching for file changes.
 
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
index fac8efbee3337..d2b736cdf81ce 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
@@ -27,16 +27,16 @@ declare const console: { log(msg: any): void; };
 /a/lib/tsc.js -b -w -verbose
 Output::
 >> Screen clear
-[12:00:25 AM] Starting compilation in watch mode...
+[12:00:23 AM] Starting compilation in watch mode...
 
-[12:00:26 AM] Projects in this build: 
+[12:00:24 AM] Projects in this build: 
     * tsconfig.json
 
-[12:00:27 AM] Project 'tsconfig.json' is out of date because oldest output 'a.js' is older than newest input 'b.ts'
+[12:00:25 AM] Project 'tsconfig.json' is out of date because oldest output 'a.js' is older than newest input 'b.ts'
 
-[12:00:28 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
+[12:00:26 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[12:00:29 AM] Found 0 errors. Watching for file changes.
+[12:00:27 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -82,13 +82,13 @@ Input::
 
 Output::
 >> Screen clear
-[12:00:33 AM] File change detected. Starting incremental compilation...
+[12:00:31 AM] File change detected. Starting incremental compilation...
 
-[12:00:34 AM] Project 'tsconfig.json' is out of date because output file 'b.js' does not exist
+[12:00:32 AM] Project 'tsconfig.json' is out of date because output file 'b.js' does not exist
 
-[12:00:35 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
+[12:00:33 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[12:00:36 AM] Found 0 errors. Watching for file changes.
+[12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
 
@@ -130,13 +130,13 @@ const x = 10;
 
 Output::
 >> Screen clear
-[12:00:40 AM] File change detected. Starting incremental compilation...
+[12:00:38 AM] File change detected. Starting incremental compilation...
 
-[12:00:41 AM] Project 'tsconfig.json' is out of date because output file 'b.js' does not exist
+[12:00:39 AM] Project 'tsconfig.json' is out of date because output file 'b.js' does not exist
 
-[12:00:42 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
+[12:00:40 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-[12:00:43 AM] Found 0 errors. Watching for file changes.
+[12:00:41 AM] Found 0 errors. Watching for file changes.
 
 
 

From c7bbb97717e5287daa960393e482570c01a5cb79 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Mon, 2 May 2022 14:58:13 -0700
Subject: [PATCH 04/15] Accept map of file content or file or symlink or folder

---
 src/harness/virtualFileSystemWithWatch.ts     | 39 ++++++++++++-------
 src/testRunner/unittests/tscWatch/emit.ts     | 21 +++-------
 src/testRunner/unittests/tscWatch/helpers.ts  |  2 +-
 .../unittests/tscWatch/watchEnvironment.ts    | 28 ++++++-------
 4 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/harness/virtualFileSystemWithWatch.ts b/src/harness/virtualFileSystemWithWatch.ts
index 8830e1cb01ac9..c034258533bba 100644
--- a/src/harness/virtualFileSystemWithWatch.ts
+++ b/src/harness/virtualFileSystemWithWatch.ts
@@ -30,11 +30,11 @@ interface Array<T> { length: number; [n: number]: T; }`
         inodeWatching?: boolean;
     }
 
-    export function createWatchedSystem(fileOrFolderList: readonly FileOrFolderOrSymLink[], params?: TestServerHostCreationParameters): TestServerHost {
+    export function createWatchedSystem(fileOrFolderList: FileOrFolderOrSymLinkMap | readonly FileOrFolderOrSymLink[], params?: TestServerHostCreationParameters): TestServerHost {
         return new TestServerHost(fileOrFolderList, params);
     }
 
-    export function createServerHost(fileOrFolderList: readonly FileOrFolderOrSymLink[], params?: TestServerHostCreationParameters): TestServerHost {
+    export function createServerHost(fileOrFolderList: FileOrFolderOrSymLinkMap | readonly FileOrFolderOrSymLink[], params?: TestServerHostCreationParameters): TestServerHost {
         const host = new TestServerHost(fileOrFolderList, params);
         // Just like sys, patch the host to use writeFile
         patchWriteFileEnsuringDirectory(host);
@@ -59,6 +59,9 @@ interface Array<T> { length: number; [n: number]: T; }`
     }
 
     export type FileOrFolderOrSymLink = File | Folder | SymLink;
+    export interface FileOrFolderOrSymLinkMap {
+        [path: string]: string | Omit<FileOrFolderOrSymLink, "path">;
+    }
     export function isFile(fileOrFolderOrSymLink: FileOrFolderOrSymLink): fileOrFolderOrSymLink is File {
         return isString((fileOrFolderOrSymLink as File).content);
     }
@@ -289,7 +292,6 @@ interface Array<T> { length: number; [n: number]: T; }`
         useCaseSensitiveFileNames: boolean;
         executingFilePath: string;
         currentDirectory: string;
-        fileOrFolderorSymLinkList: readonly FileOrFolderOrSymLink[];
         newLine?: string;
         useWindowsStylePaths?: boolean;
         environmentVariables?: ESMap<string, string>;
@@ -326,7 +328,7 @@ interface Array<T> { length: number; [n: number]: T; }`
         private readonly inodes?: ESMap<Path, number>;
         watchDirectory: HostWatchDirectory;
         constructor(
-            fileOrFolderorSymLinkList: readonly FileOrFolderOrSymLink[],
+            fileOrFolderorSymLinkList: FileOrFolderOrSymLinkMap | readonly FileOrFolderOrSymLink[],
             {
                 useCaseSensitiveFileNames, executingFilePath, currentDirectory,
                 newLine, windowsStyleRoot, environmentVariables,
@@ -415,16 +417,27 @@ interface Array<T> { length: number; [n: number]: T; }`
             return new Date(this.time);
         }
 
-        private reloadFS(fileOrFolderOrSymLinkList: readonly FileOrFolderOrSymLink[]) {
+        private reloadFS(fileOrFolderOrSymLinkList: FileOrFolderOrSymLinkMap | readonly FileOrFolderOrSymLink[]) {
             Debug.assert(this.fs.size === 0);
-            const filesOrFoldersToLoad: readonly FileOrFolderOrSymLink[] = !this.windowsStyleRoot ? fileOrFolderOrSymLinkList :
-                fileOrFolderOrSymLinkList.map<FileOrFolderOrSymLink>(f => {
-                    const result = clone(f);
-                    result.path = this.getHostSpecificPath(f.path);
-                    return result;
-                });
-            for (const fileOrDirectory of filesOrFoldersToLoad) {
-                this.ensureFileOrFolder(fileOrDirectory);
+            if (isArray(fileOrFolderOrSymLinkList)) {
+                fileOrFolderOrSymLinkList.forEach(f => this.ensureFileOrFolder(!this.windowsStyleRoot ?
+                    f :
+                    { ...f, path: this.getHostSpecificPath(f.path) }
+                ));
+            }
+            else {
+                for (const key in fileOrFolderOrSymLinkList) {
+                    if (hasProperty(fileOrFolderOrSymLinkList, key)) {
+                        const path = this.getHostSpecificPath(key);
+                        const value = fileOrFolderOrSymLinkList[key];
+                        if (isString(value)) {
+                            this.ensureFileOrFolder({ path, content: value });
+                        }
+                        else {
+                            this.ensureFileOrFolder({ path, ...value });
+                        }
+                    }
+                }
             }
         }
 
diff --git a/src/testRunner/unittests/tscWatch/emit.ts b/src/testRunner/unittests/tscWatch/emit.ts
index 217d4c059a5ba..8c9ec7150b199 100644
--- a/src/testRunner/unittests/tscWatch/emit.ts
+++ b/src/testRunner/unittests/tscWatch/emit.ts
@@ -6,21 +6,12 @@ namespace ts.tscWatch {
                 scenario,
                 subScenario: `emit with outFile or out setting/${subScenario}`,
                 commandLineArgs: ["--w", "-p", "/a/tsconfig.json"],
-                sys: () => {
-                    const config: File = {
-                        path: "/a/tsconfig.json",
-                        content: JSON.stringify({ compilerOptions: { out, outFile } })
-                    };
-                    const f1: File = {
-                        path: "/a/a.ts",
-                        content: "let x = 1"
-                    };
-                    const f2: File = {
-                        path: "/a/b.ts",
-                        content: "let y = 1"
-                    };
-                    return createWatchedSystem([f1, f2, config, libFile]);
-                },
+                sys: () => createWatchedSystem({
+                    "/a/a.ts": "let x = 1",
+                    "/a/b.ts": "let y = 1",
+                    "/a/tsconfig.json": JSON.stringify({ compilerOptions: { out, outFile } }),
+                    [libFile.path]: libFile.content,
+                }),
                 changes: [
                     {
                         caption: "Make change in the file",
diff --git a/src/testRunner/unittests/tscWatch/helpers.ts b/src/testRunner/unittests/tscWatch/helpers.ts
index 70b79aba0b605..92ad07cd8d818 100644
--- a/src/testRunner/unittests/tscWatch/helpers.ts
+++ b/src/testRunner/unittests/tscWatch/helpers.ts
@@ -432,7 +432,7 @@ namespace ts.tscWatch {
         return sys;
     }
 
-    export function createSystemWithSolutionBuild(solutionRoots: readonly string[], files: readonly TestFSWithWatch.FileOrFolderOrSymLink[], params?: TestFSWithWatch.TestServerHostCreationParameters) {
+    export function createSystemWithSolutionBuild(solutionRoots: readonly string[], files: TestFSWithWatch.FileOrFolderOrSymLinkMap | readonly TestFSWithWatch.FileOrFolderOrSymLink[], params?: TestFSWithWatch.TestServerHostCreationParameters) {
         return solutionBuildWithBaseline(createWatchedSystem(files, params), solutionRoots);
     }
 }
diff --git a/src/testRunner/unittests/tscWatch/watchEnvironment.ts b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
index 72081fdb0c775..5cc92d55b5fb5 100644
--- a/src/testRunner/unittests/tscWatch/watchEnvironment.ts
+++ b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
@@ -587,22 +587,18 @@ namespace ts.tscWatch {
                 scenario,
                 subScenario: `fsWatch/when using file watching thats on inode`,
                 commandLineArgs: ["-w", "--extendedDiagnostics"],
-                sys: () => {
-                    const configFile: File = {
-                        path: `${projectRoot}/tsconfig.json`,
-                        content: JSON.stringify({ watchOptions: { watchFile: "useFsEvents" }, files: ["foo.d.ts", "main.ts"] })
-                    };
-                    const main: File = {
-                        path: `${projectRoot}/main.ts`,
-                        content: `import { foo } from "./foo"; foo();`
-                    };
-                    const foo: File = {
-                        path: `${projectRoot}/foo.d.ts`,
-                        content: `export function foo(): string;`
-                    };
-                    const files = [libFile, main, foo, configFile];
-                    return createWatchedSystem(files, { currentDirectory: projectRoot, inodeWatching: true });
-                },
+                sys: () => createWatchedSystem(
+                    {
+                        [libFile.path]: libFile.content,
+                        [`${projectRoot}/main.ts`]: `import { foo } from "./foo"; foo();`,
+                        [`${projectRoot}/foo.d.ts`]: `export function foo(): string;`,
+                        [`${projectRoot}/tsconfig.json`]: JSON.stringify({ watchOptions: { watchFile: "useFsEvents" }, files: ["foo.d.ts", "main.ts"] }),
+                    },
+                    {
+                        currentDirectory: projectRoot,
+                        inodeWatching: true
+                    }
+                ),
                 changes: [
                     {
                         caption: "Replace file with rename event that introduces error",

From 189bbc22da1824794624844c796b42b98de30d43 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 6 May 2022 10:51:24 -0700
Subject: [PATCH 05/15] Add test when rename event occurs when file has already
 reappeared

---
 src/harness/virtualFileSystemWithWatch.ts     |  66 ++++---
 .../unittests/tscWatch/watchEnvironment.ts    |  39 ++++
 ...e-occurs-when-file-is-still-on-the-disk.js | 187 ++++++++++++++++++
 3 files changed, 260 insertions(+), 32 deletions(-)
 create mode 100644 tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js

diff --git a/src/harness/virtualFileSystemWithWatch.ts b/src/harness/virtualFileSystemWithWatch.ts
index c034258533bba..1b6bfc9c6ee3f 100644
--- a/src/harness/virtualFileSystemWithWatch.ts
+++ b/src/harness/virtualFileSystemWithWatch.ts
@@ -267,13 +267,17 @@ interface Array<T> { length: number; [n: number]: T; }`
         inode: number | undefined;
     }
 
-    export interface ReloadWatchInvokeOptions {
+    export interface WatchInvokeOptions {
         /** Invokes the directory watcher for the parent instead of the file changed */
         invokeDirectoryWatcherInsteadOfFileChanged: boolean;
         /** When new file is created, do not invoke watches for it */
         ignoreWatchInvokedWithTriggerAsFileCreate: boolean;
         /** Invoke the file delete, followed by create instead of file changed */
         invokeFileDeleteCreateAsPartInsteadOfChange: boolean;
+        /** Dont invoke delete watches */
+        ignoreDelete: boolean;
+        /** Skip inode check on file or folder create*/
+        skipInodeCheckOnCreate: boolean;
     }
 
     export enum Tsc_WatchFile {
@@ -324,7 +328,7 @@ interface Array<T> { length: number; [n: number]: T; }`
         public defaultWatchFileKind?: () => WatchFileKind | undefined;
         public storeFilesChangingSignatureDuringEmit = true;
         watchFile: HostWatchFile;
-        private readonly inodeWatching: boolean | undefined;
+        private inodeWatching: boolean | undefined;
         private readonly inodes?: ESMap<Path, number>;
         watchDirectory: HostWatchDirectory;
         constructor(
@@ -376,7 +380,7 @@ interface Array<T> { length: number; [n: number]: T; }`
                 tscWatchDirectory,
                 defaultWatchFileKind: () => this.defaultWatchFileKind?.(),
                 inodeWatching: !!this.inodeWatching,
-                sysLog: this.write.bind(this)
+                sysLog: s => this.write(s + this.newLine),
             });
             this.watchFile = watchFile;
             this.watchDirectory = watchDirectory;
@@ -441,7 +445,7 @@ interface Array<T> { length: number; [n: number]: T; }`
             }
         }
 
-        modifyFile(filePath: string, content: string, options?: Partial<ReloadWatchInvokeOptions>) {
+        modifyFile(filePath: string, content: string, options?: Partial<WatchInvokeOptions>) {
             const path = this.toFullPath(filePath);
             const currentEntry = this.fs.get(path);
             if (!currentEntry || !isFsFile(currentEntry)) {
@@ -449,8 +453,8 @@ interface Array<T> { length: number; [n: number]: T; }`
             }
 
             if (options && options.invokeFileDeleteCreateAsPartInsteadOfChange) {
-                this.removeFileOrFolder(currentEntry, returnFalse);
-                this.ensureFileOrFolder({ path: filePath, content });
+                this.removeFileOrFolder(currentEntry, /*isRenaming*/ false, options);
+                this.ensureFileOrFolder({ path: filePath, content }, /*ignoreWatchInvokedWithTriggerAsFileCreate*/ undefined, /*ignoreParentWatch*/ undefined, options);
             }
             else {
                 currentEntry.content = content;
@@ -475,7 +479,7 @@ interface Array<T> { length: number; [n: number]: T; }`
             Debug.assert(!!file);
 
             // Only remove the file
-            this.removeFileOrFolder(file, returnFalse, /*isRenaming*/ true);
+            this.removeFileOrFolder(file, /*isRenaming*/ true);
 
             // Add updated folder with new folder name
             const newFullPath = getNormalizedAbsolutePath(newFileName, this.currentDirectory);
@@ -495,7 +499,7 @@ interface Array<T> { length: number; [n: number]: T; }`
             Debug.assert(!!folder);
 
             // Only remove the folder
-            this.removeFileOrFolder(folder, returnFalse, /*isRenaming*/ true);
+            this.removeFileOrFolder(folder, /*isRenaming*/ true);
 
             // Add updated folder with new folder name
             const newFullPath = getNormalizedAbsolutePath(newFolderName, this.currentDirectory);
@@ -530,29 +534,29 @@ interface Array<T> { length: number; [n: number]: T; }`
             }
         }
 
-        ensureFileOrFolder(fileOrDirectoryOrSymLink: FileOrFolderOrSymLink, ignoreWatchInvokedWithTriggerAsFileCreate?: boolean, ignoreParentWatch?: boolean) {
+        ensureFileOrFolder(fileOrDirectoryOrSymLink: FileOrFolderOrSymLink, ignoreWatchInvokedWithTriggerAsFileCreate?: boolean, ignoreParentWatch?: boolean, options?: Partial<WatchInvokeOptions>) {
             if (isFile(fileOrDirectoryOrSymLink)) {
                 const file = this.toFsFile(fileOrDirectoryOrSymLink);
                 // file may already exist when updating existing type declaration file
                 if (!this.fs.get(file.path)) {
-                    const baseFolder = this.ensureFolder(getDirectoryPath(file.fullPath), ignoreParentWatch);
-                    this.addFileOrFolderInFolder(baseFolder, file, ignoreWatchInvokedWithTriggerAsFileCreate);
+                    const baseFolder = this.ensureFolder(getDirectoryPath(file.fullPath), ignoreParentWatch, options);
+                    this.addFileOrFolderInFolder(baseFolder, file, ignoreWatchInvokedWithTriggerAsFileCreate, options);
                 }
             }
             else if (isSymLink(fileOrDirectoryOrSymLink)) {
                 const symLink = this.toFsSymLink(fileOrDirectoryOrSymLink);
                 Debug.assert(!this.fs.get(symLink.path));
-                const baseFolder = this.ensureFolder(getDirectoryPath(symLink.fullPath), ignoreParentWatch);
-                this.addFileOrFolderInFolder(baseFolder, symLink, ignoreWatchInvokedWithTriggerAsFileCreate);
+                const baseFolder = this.ensureFolder(getDirectoryPath(symLink.fullPath), ignoreParentWatch, options);
+                this.addFileOrFolderInFolder(baseFolder, symLink, ignoreWatchInvokedWithTriggerAsFileCreate, options);
             }
             else {
                 const fullPath = getNormalizedAbsolutePath(fileOrDirectoryOrSymLink.path, this.currentDirectory);
-                this.ensureFolder(getDirectoryPath(fullPath), ignoreParentWatch);
-                this.ensureFolder(fullPath, ignoreWatchInvokedWithTriggerAsFileCreate);
+                this.ensureFolder(getDirectoryPath(fullPath), ignoreParentWatch, options);
+                this.ensureFolder(fullPath, ignoreWatchInvokedWithTriggerAsFileCreate, options);
             }
         }
 
-        private ensureFolder(fullPath: string, ignoreWatch: boolean | undefined): FsFolder {
+        private ensureFolder(fullPath: string, ignoreWatch: boolean | undefined, options: Partial<WatchInvokeOptions> | undefined): FsFolder {
             const path = this.toPath(fullPath);
             let folder = this.fs.get(path) as FsFolder;
             if (!folder) {
@@ -560,8 +564,8 @@ interface Array<T> { length: number; [n: number]: T; }`
                 const baseFullPath = getDirectoryPath(fullPath);
                 if (fullPath !== baseFullPath) {
                     // Add folder in the base folder
-                    const baseFolder = this.ensureFolder(baseFullPath, ignoreWatch);
-                    this.addFileOrFolderInFolder(baseFolder, folder, ignoreWatch);
+                    const baseFolder = this.ensureFolder(baseFullPath, ignoreWatch, options);
+                    this.addFileOrFolderInFolder(baseFolder, folder, ignoreWatch, options);
                 }
                 else {
                     // root folder
@@ -574,7 +578,7 @@ interface Array<T> { length: number; [n: number]: T; }`
             return folder;
         }
 
-        private addFileOrFolderInFolder(folder: FsFolder, fileOrDirectory: FsFile | FsFolder | FsSymLink, ignoreWatch?: boolean) {
+        private addFileOrFolderInFolder(folder: FsFolder, fileOrDirectory: FsFile | FsFolder | FsSymLink, ignoreWatch?: boolean, options?: Partial<WatchInvokeOptions>) {
             if (!this.fs.has(fileOrDirectory.path)) {
                 insertSorted(folder.entries, fileOrDirectory, (a, b) => compareStringsCaseSensitive(getBaseFileName(a.path), getBaseFileName(b.path)));
             }
@@ -585,11 +589,14 @@ interface Array<T> { length: number; [n: number]: T; }`
             if (ignoreWatch) {
                 return;
             }
+            const inodeWatching = this.inodeWatching;
+            if (options?.skipInodeCheckOnCreate) this.inodeWatching = false;
             this.invokeFileAndFsWatches(fileOrDirectory.fullPath, FileWatcherEventKind.Created);
             this.invokeFileAndFsWatches(folder.fullPath, FileWatcherEventKind.Changed);
+            this.inodeWatching = inodeWatching;
         }
 
-        private removeFileOrFolder(fileOrDirectory: FsFile | FsFolder | FsSymLink, isRemovableLeafFolder: (folder: FsFolder) => boolean, isRenaming = false) {
+        private removeFileOrFolder(fileOrDirectory: FsFile | FsFolder | FsSymLink, isRenaming?: boolean, options?: Partial<WatchInvokeOptions>) {
             const basePath = getDirectoryPath(fileOrDirectory.path);
             const baseFolder = this.fs.get(basePath) as FsFolder;
             if (basePath !== fileOrDirectory.path) {
@@ -602,21 +609,16 @@ interface Array<T> { length: number; [n: number]: T; }`
             if (isFsFolder(fileOrDirectory)) {
                 Debug.assert(fileOrDirectory.entries.length === 0 || isRenaming);
             }
-            this.invokeFileAndFsWatches(fileOrDirectory.fullPath, FileWatcherEventKind.Deleted);
+            if (!options?.ignoreDelete) this.invokeFileAndFsWatches(fileOrDirectory.fullPath, FileWatcherEventKind.Deleted);
             this.inodes?.delete(fileOrDirectory.path);
-            this.invokeFileAndFsWatches(baseFolder.fullPath, FileWatcherEventKind.Changed);
-            if (basePath !== fileOrDirectory.path &&
-                baseFolder.entries.length === 0 &&
-                isRemovableLeafFolder(baseFolder)) {
-                this.removeFileOrFolder(baseFolder, isRemovableLeafFolder);
-            }
+            if (!options?.ignoreDelete) this.invokeFileAndFsWatches(baseFolder.fullPath, FileWatcherEventKind.Changed);
         }
 
         deleteFile(filePath: string) {
             const path = this.toFullPath(filePath);
             const currentEntry = this.fs.get(path) as FsFile;
             Debug.assert(isFsFile(currentEntry));
-            this.removeFileOrFolder(currentEntry, returnFalse);
+            this.removeFileOrFolder(currentEntry);
         }
 
         deleteFolder(folderPath: string, recursive?: boolean) {
@@ -630,11 +632,11 @@ interface Array<T> { length: number; [n: number]: T; }`
                         this.deleteFolder(fsEntry.fullPath, recursive);
                     }
                     else {
-                        this.removeFileOrFolder(fsEntry, returnFalse);
+                        this.removeFileOrFolder(fsEntry);
                     }
                 });
             }
-            this.removeFileOrFolder(currentEntry, returnFalse);
+            this.removeFileOrFolder(currentEntry);
         }
 
         private watchFileWorker(fileName: string, cb: FileWatcherCallback, pollingInterval: PollingInterval) {
@@ -947,11 +949,11 @@ interface Array<T> { length: number; [n: number]: T; }`
             }
         }
 
-        prependFile(path: string, content: string, options?: Partial<ReloadWatchInvokeOptions>): void {
+        prependFile(path: string, content: string, options?: Partial<WatchInvokeOptions>): void {
             this.modifyFile(path, content + this.readFile(path), options);
         }
 
-        appendFile(path: string, content: string, options?: Partial<ReloadWatchInvokeOptions>): void {
+        appendFile(path: string, content: string, options?: Partial<WatchInvokeOptions>): void {
             this.modifyFile(path, this.readFile(path) + content, options);
         }
 
diff --git a/src/testRunner/unittests/tscWatch/watchEnvironment.ts b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
index 5cc92d55b5fb5..aa3290baf4070 100644
--- a/src/testRunner/unittests/tscWatch/watchEnvironment.ts
+++ b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
@@ -612,6 +612,45 @@ namespace ts.tscWatch {
                     },
                 ]
             });
+
+            verifyTscWatch({
+                scenario,
+                subScenario: `fsWatch/when using file watching thats on inode when rename occurs when file is still on the disk`,
+                commandLineArgs: ["-w", "--extendedDiagnostics"],
+                sys: () => createWatchedSystem(
+                    {
+                        [libFile.path]: libFile.content,
+                        [`${projectRoot}/main.ts`]: `import { foo } from "./foo"; foo();`,
+                        [`${projectRoot}/foo.ts`]: `export declare function foo(): string;`,
+                        [`${projectRoot}/tsconfig.json`]: JSON.stringify({
+                            watchOptions: { watchFile: "useFsEvents" },
+                            files: ["foo.ts", "main.ts"]
+                        }),
+                    },
+                    {
+                        currentDirectory: projectRoot,
+                        inodeWatching: true,
+                    }
+                ),
+                changes: [
+                    {
+                        caption: "Introduce error such that when callback happens file is already appeared",
+                        // vm's wq generates this kind of event
+                        // Skip delete event so inode changes but when the create's rename occurs file is on disk
+                        change: sys => sys.modifyFile(`${projectRoot}/foo.ts`, `export declare function foo2(): string;`, {
+                            invokeFileDeleteCreateAsPartInsteadOfChange: true,
+                            ignoreDelete: true,
+                            skipInodeCheckOnCreate: true
+                        }),
+                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                    },
+                    {
+                        caption: "Replace file with rename event that fixes error",
+                        change: sys => sys.modifyFile(`${projectRoot}/foo.ts`, `export declare function foo(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true, }),
+                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(0),
+                    },
+                ]
+            });
         });
     });
 }
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
new file mode 100644
index 0000000000000..252b7eec6efa3
--- /dev/null
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -0,0 +1,187 @@
+Input::
+//// [/a/lib/lib.d.ts] Inode:: 3
+/// <reference no-default-lib="true"/>
+interface Boolean {}
+interface Function {}
+interface CallableFunction {}
+interface NewableFunction {}
+interface IArguments {}
+interface Number { toExponential: any; }
+interface Object {}
+interface RegExp {}
+interface String { charAt: any; }
+interface Array<T> { length: number; [n: number]: T; }
+
+//// [/user/username/projects/myproject/main.ts] Inode:: 8
+import { foo } from "./foo"; foo();
+
+//// [/user/username/projects/myproject/foo.ts] Inode:: 9
+export declare function foo(): string;
+
+//// [/user/username/projects/myproject/tsconfig.json] Inode:: 10
+{"watchOptions":{"watchFile":"useFsEvents"},"files":["foo.ts","main.ts"]}
+
+
+/a/lib/tsc.js -w --extendedDiagnostics
+Output::
+[12:00:23 AM] Starting compilation in watch mode...
+
+Current directory: /user/username/projects/myproject CaseSensitiveFileNames: false
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 {"watchFile":4} Config file
+Synchronizing program
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main.ts 250 {"watchFile":4} Source file
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 {"watchFile":4} Source file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
+[12:00:28 AM] Found 0 errors. Watching for file changes.
+
+
+
+Program root files: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
+Program options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+Program structureReused: Not
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.ts
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/a/lib/lib.d.ts (used version)
+/user/username/projects/myproject/foo.ts (used version)
+/user/username/projects/myproject/main.ts (used version)
+
+WatchedFiles::
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+/user/username/projects/myproject/tsconfig.json:
+  {"directoryName":"/user/username/projects/myproject/tsconfig.json","inode":10}
+/user/username/projects/myproject/foo.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.ts","inode":9}
+/user/username/projects/myproject/main.ts:
+  {"directoryName":"/user/username/projects/myproject/main.ts","inode":8}
+/a/lib/lib.d.ts:
+  {"directoryName":"/a/lib/lib.d.ts","inode":3}
+
+FsWatchesRecursive::
+
+exitCode:: ExitStatus.undefined
+
+//// [/user/username/projects/myproject/foo.js] Inode:: 11
+"use strict";
+exports.__esModule = true;
+
+
+//// [/user/username/projects/myproject/main.js] Inode:: 12
+"use strict";
+exports.__esModule = true;
+var foo_1 = require("./foo");
+(0, foo_1.foo)();
+
+
+
+Change:: Introduce error such that when callback happens file is already appeared
+
+Input::
+//// [/user/username/projects/myproject/foo.ts] Inode:: 13
+export declare function foo2(): string;
+
+
+Output::
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+Synchronizing program
+[12:00:32 AM] File change detected. Starting incremental compilation...
+
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+main.ts:1:10 - error TS2724: '"./foo"' has no exported member named 'foo'. Did you mean 'foo2'?
+
+1 import { foo } from "./foo"; foo();
+           ~~~
+
+  foo.ts:1:25
+    1 export declare function foo2(): string;
+                              ~~~~
+    'foo2' is declared here.
+
+[12:00:39 AM] Found 1 error. Watching for file changes.
+
+
+
+Program root files: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
+Program options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+Program structureReused: Completely
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/foo.ts
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/user/username/projects/myproject/foo.ts (computed .d.ts)
+/user/username/projects/myproject/main.ts (computed .d.ts)
+
+WatchedFiles::
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+/user/username/projects/myproject/tsconfig.json:
+  {"directoryName":"/user/username/projects/myproject/tsconfig.json","inode":10}
+/user/username/projects/myproject/foo.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.ts","inode":9}
+/user/username/projects/myproject/main.ts:
+  {"directoryName":"/user/username/projects/myproject/main.ts","inode":8}
+/a/lib/lib.d.ts:
+  {"directoryName":"/a/lib/lib.d.ts","inode":3}
+
+FsWatchesRecursive::
+
+exitCode:: ExitStatus.undefined
+
+//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 11
+//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 12
+
+Change:: Replace file with rename event that fixes error
+
+Input::
+//// [/user/username/projects/myproject/foo.ts] Inode:: 14
+export declare function foo(): string;
+
+
+Output::
+
+WatchedFiles::
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+/user/username/projects/myproject/tsconfig.json:
+  {"directoryName":"/user/username/projects/myproject/tsconfig.json","inode":10}
+/user/username/projects/myproject/foo.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.ts","inode":9}
+/user/username/projects/myproject/main.ts:
+  {"directoryName":"/user/username/projects/myproject/main.ts","inode":8}
+/a/lib/lib.d.ts:
+  {"directoryName":"/a/lib/lib.d.ts","inode":3}
+
+FsWatchesRecursive::
+
+exitCode:: ExitStatus.undefined
+

From 5dfdbdb136555efc9acfb376697b80956fbeaf87 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 6 May 2022 12:04:47 -0700
Subject: [PATCH 06/15] On rename event for the file, replace file watcher
 irrespective of file presence

---
 src/compiler/sys.ts                           | 29 +++++------
 .../unittests/tscWatch/watchEnvironment.ts    |  2 +-
 ...are-global-and-installed-at-later-point.js |  3 +-
 ...le-resolution-changes-to-ambient-module.js |  4 +-
 ...der-that-already-contains-@types-folder.js |  4 +-
 ...e-occurs-when-file-is-still-on-the-disk.js | 48 +++++++++++++++++--
 ...when-using-file-watching-thats-on-inode.js | 14 ++++--
 .../with-fallbackPolling-option.js            |  3 +-
 8 files changed, 78 insertions(+), 29 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index ba669009e31c4..a2f366e9bf71e 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1096,17 +1096,10 @@ namespace ts {
                 }
             };
 
-            /**
-             * Invoke the callback with rename and update the watcher if not closed
-             * @param createWatcher
-             */
-            function invokeCallbackAndUpdateWatcher(createWatcher: () => FileWatcher) {
-                sysLog(`sysLog:: ${fileOrDirectory}:: Changing watcher to ${createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing"}FileSystemEntryWatcher`);
-                // Call the callback for current directory
-                callback("rename", "");
-
+            function updateWatcher(createWatcher: () => FileWatcher) {
                 // If watcher is not closed, update it
                 if (watcher) {
+                    sysLog(`sysLog:: ${fileOrDirectory}:: Changing watcher to ${createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing"}FileSystemEntryWatcher`);
                     watcher.close();
                     watcher = createWatcher();
                 }
@@ -1130,7 +1123,10 @@ namespace ts {
                             callback
                     );
                     // Watch the missing file or directory or error
-                    presentWatcher.on("error", () => invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry));
+                    presentWatcher.on("error", () => {
+                        callback("rename", "");
+                        updateWatcher(watchMissingFileSystemEntry);
+                    });
                     return presentWatcher;
                 }
                 catch (e) {
@@ -1144,15 +1140,15 @@ namespace ts {
             }
 
             function callbackChangingToMissingFileSystemEntry(event: "rename" | "change", relativeName: string | undefined) {
+                callback(event, relativeName);
                 // because relativeName is not guaranteed to be correct we need to check on each rename with few combinations
                 // Eg on ubuntu while watching app/node_modules the relativeName is "node_modules" which is neither relative nor full path
-                return event === "rename" &&
+                if (event === "rename" &&
                     (!relativeName ||
                         relativeName === lastDirectoryPart ||
-                        (relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator!) !== -1 && relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator!) === relativeName.length - lastDirectoryPartWithDirectorySeparator!.length)) &&
-                    !fileSystemEntryExists(fileOrDirectory, entryKind) ?
-                    invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry) :
-                    callback(event, relativeName);
+                        (relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator!) !== -1 && relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator!) === relativeName.length - lastDirectoryPartWithDirectorySeparator!.length))) {
+                    updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                }
             }
 
             /**
@@ -1177,10 +1173,11 @@ namespace ts {
                     fileOrDirectory,
                     (_fileName, eventKind) => {
                         if (eventKind === FileWatcherEventKind.Created && fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                            callback("rename", "");
                             // Call the callback for current file or directory
                             // For now it could be callback for the inner directory creation,
                             // but just return current directory, better than current no-op
-                            invokeCallbackAndUpdateWatcher(watchPresentFileSystemEntry);
+                            updateWatcher(watchPresentFileSystemEntry);
                         }
                     },
                     fallbackPollingInterval,
diff --git a/src/testRunner/unittests/tscWatch/watchEnvironment.ts b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
index aa3290baf4070..c050451193ec6 100644
--- a/src/testRunner/unittests/tscWatch/watchEnvironment.ts
+++ b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
@@ -647,7 +647,7 @@ namespace ts.tscWatch {
                     {
                         caption: "Replace file with rename event that fixes error",
                         change: sys => sys.modifyFile(`${projectRoot}/foo.ts`, `export declare function foo(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true, }),
-                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(0),
+                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
                     },
                 ]
             });
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
index 30ba8ca1f84a9..e1320878fe8ab 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
@@ -87,7 +87,8 @@ declare namespace myapp {
 
 
 Output::
-sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
+
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
index c712851e8d1d0..8dea1d815e32b 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
@@ -87,7 +87,9 @@ declare module "fs" {
 
 
 Output::
-sysLog:: /a/b/node_modules:: Changing watcher to PresentFileSystemEntryWatchersysLog:: /a/b/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: /a/b/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: /a/b/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
+
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
index 8e1f319c075f2..682abdee15795 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
@@ -79,7 +79,9 @@ export {}
 //// [/user/username/projects/myproject/node_modules2/@types/qqq/index.d.ts] deleted
 
 Output::
-sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatchersysLog:: /user/username/projects/myproject/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: /user/username/projects/myproject/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
+
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
index 252b7eec6efa3..c4141fa5d0453 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -101,6 +101,7 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.ts:: Changing watcher to PresentFileSystemEntryWatcher
 Synchronizing program
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
@@ -144,12 +145,12 @@ WatchedFiles::
 FsWatches::
 /user/username/projects/myproject/tsconfig.json:
   {"directoryName":"/user/username/projects/myproject/tsconfig.json","inode":10}
-/user/username/projects/myproject/foo.ts:
-  {"directoryName":"/user/username/projects/myproject/foo.ts","inode":9}
 /user/username/projects/myproject/main.ts:
   {"directoryName":"/user/username/projects/myproject/main.ts","inode":8}
 /a/lib/lib.d.ts:
   {"directoryName":"/a/lib/lib.d.ts","inode":3}
+/user/username/projects/myproject/foo.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.ts","inode":13}
 
 FsWatchesRecursive::
 
@@ -166,6 +167,43 @@ export declare function foo(): string;
 
 
 Output::
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.ts:: Changing watcher to MissingFileSystemEntryWatcher
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.ts:: Changing watcher to PresentFileSystemEntryWatcher
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.ts:: Changing watcher to PresentFileSystemEntryWatcher
+Synchronizing program
+[12:00:43 AM] File change detected. Starting incremental compilation...
+
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+[12:00:50 AM] Found 0 errors. Watching for file changes.
+
+
+
+Program root files: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
+Program options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+Program structureReused: SafeModules
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/foo.ts
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/user/username/projects/myproject/foo.ts (computed .d.ts)
+/user/username/projects/myproject/main.ts (computed .d.ts)
 
 WatchedFiles::
 /user/username/projects/myproject/node_modules/@types:
@@ -174,14 +212,16 @@ WatchedFiles::
 FsWatches::
 /user/username/projects/myproject/tsconfig.json:
   {"directoryName":"/user/username/projects/myproject/tsconfig.json","inode":10}
-/user/username/projects/myproject/foo.ts:
-  {"directoryName":"/user/username/projects/myproject/foo.ts","inode":9}
 /user/username/projects/myproject/main.ts:
   {"directoryName":"/user/username/projects/myproject/main.ts","inode":8}
 /a/lib/lib.d.ts:
   {"directoryName":"/a/lib/lib.d.ts","inode":3}
+/user/username/projects/myproject/foo.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.ts","inode":14}
 
 FsWatchesRecursive::
 
 exitCode:: ExitStatus.undefined
 
+//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 11
+//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 12
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
index caded90c6c1bb..534e0e7161485 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
@@ -99,18 +99,21 @@ export function foo2(): string;
 
 
 Output::
-sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcherFileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcherFileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
@@ -180,18 +183,21 @@ export function foo(): string;
 
 
 Output::
-sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcherFileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcherFileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js
index 880868fe56a4d..107621d3195ca 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js
@@ -29,7 +29,8 @@ Output::
 
 [12:00:22 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: /a/b:: Changing to watchFile
+sysLog:: /a/b:: Changing to watchFile
+
 
 Program root files: ["/a/b/commonFile1.ts","/a/b/commonFile2.ts"]
 Program options: {"watch":true,"project":"/a/b/tsconfig.json","configFilePath":"/a/b/tsconfig.json"}

From dfbed67fd90de6cccb841049352a4c4837af004c Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 6 May 2022 13:57:04 -0700
Subject: [PATCH 07/15] Fix regex

---
 src/testRunner/unittests/tsserver/helpers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/testRunner/unittests/tsserver/helpers.ts b/src/testRunner/unittests/tsserver/helpers.ts
index de36860b09c42..bd99f8c79c4a6 100644
--- a/src/testRunner/unittests/tsserver/helpers.ts
+++ b/src/testRunner/unittests/tsserver/helpers.ts
@@ -109,7 +109,7 @@ namespace ts.projectSystem {
                     .replace(/getExportInfoMap: done in \d+(?:\.\d+)?/g, `getExportInfoMap: done in *`)
                     .replace(/collectAutoImports: \d+(?:\.\d+)?/g, `collectAutoImports: *`)
                     .replace(/dependencies in \d+(?:\.\d+)?/g, `dependencies in *`)
-                    .replace(/\"exportMapKey\"\:\"\w(\w|\d)*\|\d+\|/g, match => match.replace(/\|\d+\|/, `|*|`))
+                    .replace(/\"exportMapKey\"\:\"[_$a-zA-Z][_$_$a-zA-Z0-9]*\|\d+\|/g, match => match.replace(/\|\d+\|/, `|*|`))
             )
         };
     }

From bb32906dd4861ac985053ee566632c712a636566 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 6 May 2022 15:27:24 -0700
Subject: [PATCH 08/15] Ensure that when doing inode watching watchers is
 replaces only on disappearance or appearance

---
 src/compiler/sys.ts                           |   7 +-
 .../unittests/tscWatch/watchEnvironment.ts    |  35 +++
 ...e-occurs-when-file-is-still-on-the-disk.js | 220 ++++++++++++++++++
 3 files changed, 261 insertions(+), 1 deletion(-)
 create mode 100644 tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index a2f366e9bf71e..c0ab1065755a8 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1147,7 +1147,12 @@ namespace ts {
                     (!relativeName ||
                         relativeName === lastDirectoryPart ||
                         (relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator!) !== -1 && relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator!) === relativeName.length - lastDirectoryPartWithDirectorySeparator!.length))) {
-                    updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    if (inodeWatching) {
+                        updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    }
+                    else if (!fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                        updateWatcher(watchMissingFileSystemEntry);
+                    }
                 }
             }
 
diff --git a/src/testRunner/unittests/tscWatch/watchEnvironment.ts b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
index c050451193ec6..7428d9d1a1595 100644
--- a/src/testRunner/unittests/tscWatch/watchEnvironment.ts
+++ b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
@@ -582,6 +582,41 @@ namespace ts.tscWatch {
             });
         });
 
+        verifyTscWatch({
+            scenario,
+            subScenario: `fsWatch/when using file watching thats when rename occurs when file is still on the disk`,
+            commandLineArgs: ["-w", "--extendedDiagnostics"],
+            sys: () => createWatchedSystem(
+                {
+                    [libFile.path]: libFile.content,
+                    [`${projectRoot}/main.ts`]: `import { foo } from "./foo"; foo();`,
+                    [`${projectRoot}/foo.ts`]: `export declare function foo(): string;`,
+                    [`${projectRoot}/tsconfig.json`]: JSON.stringify({
+                        watchOptions: { watchFile: "useFsEvents" },
+                        files: ["foo.ts", "main.ts"]
+                    }),
+                },
+                { currentDirectory: projectRoot, }
+            ),
+            changes: [
+                {
+                    caption: "Introduce error such that when callback happens file is already appeared",
+                    // vm's wq generates this kind of event
+                    // Skip delete event so inode changes but when the create's rename occurs file is on disk
+                    change: sys => sys.modifyFile(`${projectRoot}/foo.ts`, `export declare function foo2(): string;`, {
+                        invokeFileDeleteCreateAsPartInsteadOfChange: true,
+                        ignoreDelete: true,
+                    }),
+                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                },
+                {
+                    caption: "Replace file with rename event that fixes error",
+                    change: sys => sys.modifyFile(`${projectRoot}/foo.ts`, `export declare function foo(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true, }),
+                    timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                },
+            ]
+        });
+
         describe("with fsWatch on inodes", () => {
             verifyTscWatch({
                 scenario,
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
new file mode 100644
index 0000000000000..129e3ec2f790a
--- /dev/null
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -0,0 +1,220 @@
+Input::
+//// [/a/lib/lib.d.ts]
+/// <reference no-default-lib="true"/>
+interface Boolean {}
+interface Function {}
+interface CallableFunction {}
+interface NewableFunction {}
+interface IArguments {}
+interface Number { toExponential: any; }
+interface Object {}
+interface RegExp {}
+interface String { charAt: any; }
+interface Array<T> { length: number; [n: number]: T; }
+
+//// [/user/username/projects/myproject/main.ts]
+import { foo } from "./foo"; foo();
+
+//// [/user/username/projects/myproject/foo.ts]
+export declare function foo(): string;
+
+//// [/user/username/projects/myproject/tsconfig.json]
+{"watchOptions":{"watchFile":"useFsEvents"},"files":["foo.ts","main.ts"]}
+
+
+/a/lib/tsc.js -w --extendedDiagnostics
+Output::
+[12:00:23 AM] Starting compilation in watch mode...
+
+Current directory: /user/username/projects/myproject CaseSensitiveFileNames: false
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 {"watchFile":4} Config file
+Synchronizing program
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main.ts 250 {"watchFile":4} Source file
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 {"watchFile":4} Source file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
+[12:00:28 AM] Found 0 errors. Watching for file changes.
+
+
+
+Program root files: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
+Program options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+Program structureReused: Not
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.ts
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/a/lib/lib.d.ts (used version)
+/user/username/projects/myproject/foo.ts (used version)
+/user/username/projects/myproject/main.ts (used version)
+
+WatchedFiles::
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+/user/username/projects/myproject/tsconfig.json:
+  {"directoryName":"/user/username/projects/myproject/tsconfig.json"}
+/user/username/projects/myproject/foo.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.ts"}
+/user/username/projects/myproject/main.ts:
+  {"directoryName":"/user/username/projects/myproject/main.ts"}
+/a/lib/lib.d.ts:
+  {"directoryName":"/a/lib/lib.d.ts"}
+
+FsWatchesRecursive::
+
+exitCode:: ExitStatus.undefined
+
+//// [/user/username/projects/myproject/foo.js]
+"use strict";
+exports.__esModule = true;
+
+
+//// [/user/username/projects/myproject/main.js]
+"use strict";
+exports.__esModule = true;
+var foo_1 = require("./foo");
+(0, foo_1.foo)();
+
+
+
+Change:: Introduce error such that when callback happens file is already appeared
+
+Input::
+//// [/user/username/projects/myproject/foo.ts]
+export declare function foo2(): string;
+
+
+Output::
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+Synchronizing program
+[12:00:32 AM] File change detected. Starting incremental compilation...
+
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+main.ts:1:10 - error TS2724: '"./foo"' has no exported member named 'foo'. Did you mean 'foo2'?
+
+1 import { foo } from "./foo"; foo();
+           ~~~
+
+  foo.ts:1:25
+    1 export declare function foo2(): string;
+                              ~~~~
+    'foo2' is declared here.
+
+[12:00:39 AM] Found 1 error. Watching for file changes.
+
+
+
+Program root files: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
+Program options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+Program structureReused: Completely
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/foo.ts
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/user/username/projects/myproject/foo.ts (computed .d.ts)
+/user/username/projects/myproject/main.ts (computed .d.ts)
+
+WatchedFiles::
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+/user/username/projects/myproject/tsconfig.json:
+  {"directoryName":"/user/username/projects/myproject/tsconfig.json"}
+/user/username/projects/myproject/foo.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.ts"}
+/user/username/projects/myproject/main.ts:
+  {"directoryName":"/user/username/projects/myproject/main.ts"}
+/a/lib/lib.d.ts:
+  {"directoryName":"/a/lib/lib.d.ts"}
+
+FsWatchesRecursive::
+
+exitCode:: ExitStatus.undefined
+
+//// [/user/username/projects/myproject/foo.js] file written with same contents
+//// [/user/username/projects/myproject/main.js] file written with same contents
+
+Change:: Replace file with rename event that fixes error
+
+Input::
+//// [/user/username/projects/myproject/foo.ts]
+export declare function foo(): string;
+
+
+Output::
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+Synchronizing program
+[12:00:43 AM] File change detected. Starting incremental compilation...
+
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+[12:00:50 AM] Found 0 errors. Watching for file changes.
+
+
+
+Program root files: ["/user/username/projects/myproject/foo.ts","/user/username/projects/myproject/main.ts"]
+Program options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+Program structureReused: SafeModules
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/foo.ts
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/user/username/projects/myproject/foo.ts (computed .d.ts)
+/user/username/projects/myproject/main.ts (computed .d.ts)
+
+WatchedFiles::
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+/user/username/projects/myproject/tsconfig.json:
+  {"directoryName":"/user/username/projects/myproject/tsconfig.json"}
+/user/username/projects/myproject/foo.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.ts"}
+/user/username/projects/myproject/main.ts:
+  {"directoryName":"/user/username/projects/myproject/main.ts"}
+/a/lib/lib.d.ts:
+  {"directoryName":"/a/lib/lib.d.ts"}
+
+FsWatchesRecursive::
+
+exitCode:: ExitStatus.undefined
+
+//// [/user/username/projects/myproject/foo.js] file written with same contents
+//// [/user/username/projects/myproject/main.js] file written with same contents

From dd2164ac83666725c4cc58e0223425b10530d682 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Mon, 23 May 2022 15:30:56 -0700
Subject: [PATCH 09/15] Some logging for debugging further

---
 src/compiler/sys.ts                           |  15 +-
 .../demo/updates-with-bad-reference.js        |   2 +
 .../demo/updates-with-circular-reference.js   |   2 +
 ...for-changes-to-package-json-main-fields.js |   5 +
 ...t-correctly-with-cts-and-mts-extensions.js |  21 ++
 ...n-no-files-are-emitted-with-incremental.js |   6 +
 ...when-watching-when-no-files-are-emitted.js |   4 +
 ...mit-any-files-on-error-with-incremental.js |  41 +++
 .../does-not-emit-any-files-on-error.js       |  32 ++
 .../incremental-updates-in-verbose-mode.js    |  14 +
 .../when-file-with-no-error-changes.js        |   4 +
 ...ing-errors-only-changed-file-is-emitted.js |  10 +
 .../when-file-with-no-error-changes.js        |   2 +
 ...ixing-error-files-all-files-are-emitted.js |  14 +
 .../when-preserveWatchOutput-is-not-used.js   |   8 +
 ...veWatchOutput-is-passed-on-command-line.js |   6 +
 ...e-of-program-emit-with-outDir-specified.js |  13 +
 ...r-recompilation-because-of-program-emit.js |  17 +
 ...tches-config-files-that-are-not-present.js |  10 +
 ...e-down-stream-project-and-then-fixes-it.js |  13 +
 ...ncing-project-even-for-non-local-change.js |  24 ++
 ...le-is-added,-and-its-subsequent-updates.js |  31 ++
 ...hanges-and-reports-found-errors-message.js |  40 +++
 ...not-start-build-of-referencing-projects.js |  12 +
 ...le-is-added,-and-its-subsequent-updates.js |  38 +++
 ...hanges-and-reports-found-errors-message.js |  46 +++
 ...not-start-build-of-referencing-projects.js |  14 +
 ...hen-noUnusedParameters-changes-to-false.js |   4 +
 .../works-with-extended-source-files.js       |  13 +
 ...hen-there-are-23-projects-in-a-solution.js | 303 ++++++++++++++++++
 ...when-there-are-3-projects-in-a-solution.js |  24 ++
 ...when-there-are-5-projects-in-a-solution.js |  36 +++
 ...when-there-are-8-projects-in-a-solution.js | 102 ++++++
 .../publicApi/with-custom-transformers.js     |   9 +
 .../reexport/Reports-errors-correctly.js      |   4 +
 ...e-projects-with-single-watcher-per-file.js |   7 +
 .../same-file-in-multiple-projects.js         |   7 +
 .../createWatchOfConfigFile.js                |   2 +
 ...Result-on-WatchCompilerHostOfConfigFile.js |   2 +
 ...s-deleted-and-created-as-part-of-change.js |   6 +
 .../should-emit-specified-file.js             |   9 +
 ...elf-if-'--isolatedModules'-is-specified.js |   3 +
 ...-if-'--out'-or-'--outFile'-is-specified.js |   3 +
 ...should-be-up-to-date-with-deleted-files.js |   6 +
 ...-be-up-to-date-with-newly-created-files.js |   9 +
 ...-to-date-with-the-reference-map-changes.js |  21 ++
 ...les-referencing-it-if-its-shape-changed.js |   8 +
 .../should-detect-non-existing-code-file.js   |   9 +
 .../should-detect-removed-code-file.js        |   4 +
 ...ll-files-if-a-global-file-changed-shape.js |   7 +
 ...ould-return-cascaded-affected-file-list.js |  16 +
 ...fine-for-files-with-circular-references.js |   4 +
 .../config-does-not-have-out-or-outFile.js    |   8 +
 .../config-has-out.js                         |   6 +
 .../config-has-outFile.js                     |   6 +
 ...-recursive-directory-watcher-is-invoked.js |   2 +
 .../errors-for-.d.ts-change.js                |  11 +
 .../errors-for-.ts-change.js                  |  13 +
 ...g-a-deep-multilevel-import-that-changes.js |  15 +
 .../with-noEmitOnError-with-incremental.js    |  31 ++
 .../with-noEmitOnError.js                     |  27 ++
 .../errors-for-.d.ts-change.js                |  13 +
 .../errors-for-.ts-change.js                  |  18 ++
 ...g-a-deep-multilevel-import-that-changes.js |  18 ++
 .../with-noEmitOnError-with-incremental.js    |  38 +++
 .../with-noEmitOnError.js                     |  34 ++
 .../errors-for-.d.ts-change.js                |  11 +
 .../errors-for-.ts-change.js                  |  13 +
 ...g-a-deep-multilevel-import-that-changes.js |  15 +
 .../with-noEmitOnError-with-incremental.js    |  31 ++
 .../default/with-noEmitOnError.js             |  27 ++
 .../errors-for-.d.ts-change.js                |  19 ++
 .../errors-for-.ts-change.js                  |  21 ++
 ...g-a-deep-multilevel-import-that-changes.js |  24 ++
 .../with-noEmitOnError-with-incremental.js    |  38 +++
 .../defaultAndD/with-noEmitOnError.js         |  34 ++
 .../errors-for-.d.ts-change.js                |  27 ++
 .../errors-for-.ts-change.js                  |  19 ++
 ...g-a-deep-multilevel-import-that-changes.js |  21 ++
 .../with-noEmitOnError-with-incremental.js    |  31 ++
 .../with-noEmitOnError.js                     |  31 ++
 .../errors-for-.d.ts-change.js                |  29 ++
 .../errors-for-.ts-change.js                  |  24 ++
 ...g-a-deep-multilevel-import-that-changes.js |  24 ++
 .../with-noEmitOnError-with-incremental.js    |  38 +++
 .../with-noEmitOnError.js                     |  38 +++
 .../errors-for-.d.ts-change.js                |  27 ++
 .../errors-for-.ts-change.js                  |  19 ++
 ...g-a-deep-multilevel-import-that-changes.js |  21 ++
 .../with-noEmitOnError-with-incremental.js    |  31 ++
 .../incremental/default/with-noEmitOnError.js |  31 ++
 .../errors-for-.d.ts-change.js                |  35 ++
 .../errors-for-.ts-change.js                  |  27 ++
 ...g-a-deep-multilevel-import-that-changes.js |  30 ++
 .../with-noEmitOnError-with-incremental.js    |  38 +++
 .../defaultAndD/with-noEmitOnError.js         |  38 +++
 .../errors-for-.d.ts-change.js                |  27 ++
 .../errors-for-.ts-change.js                  |  15 +
 ...g-a-deep-multilevel-import-that-changes.js |  15 +
 .../with-noEmitOnError-with-incremental.js    |  31 ++
 .../isolatedModules/with-noEmitOnError.js     |  31 ++
 .../errors-for-.d.ts-change.js                |  35 ++
 .../errors-for-.ts-change.js                  |  24 ++
 ...g-a-deep-multilevel-import-that-changes.js |  30 ++
 .../with-noEmitOnError-with-incremental.js    |  38 +++
 .../isolatedModulesAndD/with-noEmitOnError.js |  38 +++
 .../errors-for-.d.ts-change.js                |  11 +
 .../errors-for-.ts-change.js                  |   9 +
 ...g-a-deep-multilevel-import-that-changes.js |   9 +
 .../with-noEmitOnError-with-incremental.js    |  31 ++
 .../isolatedModules/with-noEmitOnError.js     |  27 ++
 .../errors-for-.d.ts-change.js                |  19 ++
 .../errors-for-.ts-change.js                  |  18 ++
 ...g-a-deep-multilevel-import-that-changes.js |  24 ++
 .../with-noEmitOnError-with-incremental.js    |  38 +++
 .../isolatedModulesAndD/with-noEmitOnError.js |  34 ++
 ...n-Windows-style-drive-root-is-lowercase.js |   4 +
 ...n-Windows-style-drive-root-is-uppercase.js |   4 +
 ...ry-symlink-target-and-import-match-disk.js |   3 +
 ...le-symlink-target-and-import-match-disk.js |   4 +
 ...nging-module-name-with-different-casing.js |   3 +
 ...target-matches-disk-but-import-does-not.js |   3 +
 ...target-matches-disk-but-import-does-not.js |   4 +
 ...link-target,-and-disk-are-all-different.js |   3 +
 ...link-target,-and-disk-are-all-different.js |  11 +
 ...link-target-agree-but-do-not-match-disk.js |   3 +
 ...link-target-agree-but-do-not-match-disk.js |   4 +
 ...k-but-directory-symlink-target-does-not.js |   3 +
 ...s-disk-but-file-symlink-target-does-not.js |   4 +
 ...ative-information-file-location-changes.js |   3 +
 ...hen-renaming-file-with-different-casing.js |   5 +
 .../editing-module-augmentation-watch.js      |   3 +
 ...for-changes-to-package-json-main-fields.js |   4 +
 .../esm-mode-file-is-edited.js                |   2 +
 ...configFile-contents-when-options-change.js |   2 +
 ...rts-errors-when-the-config-file-changes.js |   4 +
 ...nostics-when-'--noUnusedLabels'-changes.js |   4 +
 ...-a-configured-program-without-file-list.js |   6 +
 ...hould-remove-the-module-not-found-error.js |   5 +
 ...ot-files-has-changed-(new-file-on-disk).js |   6 +
 ...-root-files-has-changed-through-include.js |   5 +
 .../programUpdates/change-module-to-none.js   |   3 +
 .../programUpdates/config-file-is-deleted.js  |   2 +
 ...s-changes-in-lib-section-of-config-file.js |   3 +
 .../create-watch-without-config-file.js       |   2 +
 ...eleted-files-affect-project-structure-2.js |   1 +
 .../deleted-files-affect-project-structure.js |   1 +
 .../handle-recreated-files-correctly.js       |  13 +
 ...tore-the-states-for-configured-projects.js |  25 ++
 ...estore-the-states-for-inferred-projects.js |   6 +
 ...rors-correctly-with-file-not-in-rootDir.js |   3 +
 ...s-errors-correctly-with-isolatedModules.js |   3 +
 .../declarationDir-is-specified.js            |  13 +
 ...-outDir-and-declarationDir-is-specified.js |   9 +
 .../when-outDir-is-specified.js               |   7 +
 .../with-outFile.js                           |   6 +
 ...e-is-specified-with-declaration-enabled.js |  17 +
 .../without-outDir-or-outFile-is-specified.js |  11 +
 ...odule-resolution-changes-in-config-file.js |   1 +
 ...tes-diagnostics-and-emit-for-decorators.js |   6 +
 ...it-when-useDefineForClassFields-changes.js |   3 +
 .../updates-emit-on-jsx-option-change.js      |   4 +
 ...mit-when-importsNotUsedAsValues-changes.js |  12 +
 ...on-emit-is-disabled-in-compiler-options.js |   8 +
 ...when-ambient-modules-of-program-changes.js |  10 +
 ...orceConsistentCasingInFileNames-changes.js |   2 +
 ...s-errors-when-noErrorTruncation-changes.js |   2 +
 ...es-errors-when-strictNullChecks-changes.js |   6 +
 ...solution-when-resolveJsonModule-changes.js |   7 +
 ...and-new-file-is-added-as-part-of-change.js |   7 +
 .../when-creating-extensionless-file.js       |   2 +
 ...n-creating-new-file-in-symlinked-folder.js |   4 +
 ...file-is-added-to-the-referenced-project.js |  24 ++
 ...ibCheck-and-skipDefaultLibCheck-changes.js |  12 +
 .../on-sample-project.js                      |  23 ++
 ...-different-folders-with-no-files-clause.js |  51 +++
 ...nsitive-references-in-different-folders.js |  32 ++
 .../tscWatch/resolutionCache/caching-works.js |  14 +
 .../watch-with-configFile.js                  |  13 +
 .../watch-without-configFile.js               |   9 +
 .../loads-missing-files-from-disk.js          |   9 +
 ...module-goes-missing-and-then-comes-back.js |  11 +
 ...are-global-and-installed-at-later-point.js |  26 ++
 ...-no-notification-from-fs-for-index-file.js |  78 +++++
 ...le-resolution-changes-to-ambient-module.js |  20 ++
 ...der-that-already-contains-@types-folder.js |  11 +
 ...rogram-with-files-from-external-library.js |   2 +
 .../extraFileExtensions-are-supported.js      |   5 +
 ...createSemanticDiagnosticsBuilderProgram.js |   2 +
 ...ing-useSourceOfProjectReferenceRedirect.js |  24 ++
 ...-host-implementing-getParsedCommandLine.js |  12 +
 ...-timesouts-on-host-program-gets-updated.js |   5 +
 ...e-occurs-when-file-is-still-on-the-disk.js |   5 +
 ...when-using-file-watching-thats-on-inode.js |  20 ++
 ...e-occurs-when-file-is-still-on-the-disk.js |   3 +
 ...rectory-when-renaming-file-in-subfolder.js |  10 +
 ...ymlinks-to-folders-in-recursive-folders.js |   2 +
 ...hronous-watch-directory-renaming-a-file.js |  11 +
 ...ory-with-outDir-and-declaration-enabled.js |  10 +
 .../with-non-synchronous-watch-directory.js   |  25 ++
 ...lt-as-fixed-chunk-size-watch-file-works.js |   4 +
 .../using-fixed-chunk-size-polling.js         |   4 +
 ...eDirectories-option-extendedDiagnostics.js |   5 +
 ...-directory-watching-extendedDiagnostics.js |   4 +
 ...ption-with-recursive-directory-watching.js |   4 +
 .../with-excludeDirectories-option.js         |   5 +
 ...excludeFiles-option-extendedDiagnostics.js |   5 +
 .../watchOptions/with-excludeFiles-option.js  |   5 +
 208 files changed, 3422 insertions(+), 2 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index c0ab1065755a8..fa59f3914c6d3 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1120,10 +1120,15 @@ namespace ts {
                         recursive,
                         inodeWatching ?
                             callbackChangingToMissingFileSystemEntry :
-                            callback
+                            (eventName, relativeFileName) => {
+
+                                sysLog(`sysLog:: watchPresentFileSystemEntry:: ${fileOrDirectory} ${entryKind} ${eventName}:: ${relativeFileName}`);
+                                callback(eventName, relativeFileName);
+                            }
                     );
                     // Watch the missing file or directory or error
                     presentWatcher.on("error", () => {
+                        sysLog(`sysLog:: watchPresentFileSystemEntry:: on Error ${fileOrDirectory} ${entryKind} rename, ""`);
                         callback("rename", "");
                         updateWatcher(watchMissingFileSystemEntry);
                     });
@@ -1140,6 +1145,7 @@ namespace ts {
             }
 
             function callbackChangingToMissingFileSystemEntry(event: "rename" | "change", relativeName: string | undefined) {
+                sysLog(`sysLog:: callbackChangingToMissingFileSystemEntry:: ${fileOrDirectory} ${entryKind} ${event}:: ${relativeName} ${inodeWatching} ${lastDirectoryPart} ${lastDirectoryPartWithDirectorySeparator}`);
                 callback(event, relativeName);
                 // because relativeName is not guaranteed to be correct we need to check on each rename with few combinations
                 // Eg on ubuntu while watching app/node_modules the relativeName is "node_modules" which is neither relative nor full path
@@ -1163,7 +1169,10 @@ namespace ts {
             function watchPresentFileSystemEntryWithFsWatchFile(): FileWatcher {
                 return watchFile(
                     fileOrDirectory,
-                    createFileWatcherCallback(callback),
+                    createFileWatcherCallback((eventName, relativeFileName) => {
+                        sysLog(`sysLog:: watchPresentFileSystemEntryWithFsWatchFile:: ${fileOrDirectory} ${entryKind} ${eventName}:: ${relativeFileName}`);
+                        callback(eventName, relativeFileName);
+                    }),
                     fallbackPollingInterval,
                     fallbackOptions
                 );
@@ -1177,7 +1186,9 @@ namespace ts {
                 return watchFile(
                     fileOrDirectory,
                     (_fileName, eventKind) => {
+                        sysLog(`sysLog:: watchMissingFileSystemEntry:: ${fileOrDirectory} ${entryKind} ${_fileName}:: ${eventKind}`);
                         if (eventKind === FileWatcherEventKind.Created && fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                            sysLog(`sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher`);
                             callback("rename", "");
                             // Call the callback for current file or directory
                             // For now it could be callback for the inner directory creation,
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
index b36912f7aa3ec..7e24b0a5cde10 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
@@ -433,6 +433,8 @@ export function lastElementOf<T>(arr: T[]): T | undefined {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/demo/core 1 change:: utilities.ts
+
 >> Screen clear
 [12:01:07 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
index e8f43afdbba83..be98b50cfe64c 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
@@ -216,6 +216,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/demo/core 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
index 757edf9d88cf3..fc9e9b9d46051 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
@@ -278,6 +278,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
+
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
@@ -370,6 +372,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
+
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
@@ -414,6 +418,7 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.ts' does not e
 File '/user/username/projects/myproject/packages/pkg2/build/const.tsx' does not exist.
 File '/user/username/projects/myproject/packages/pkg2/build/const.d.ts' exist - use it as a name resolution result.
 ======== Module name './const.js' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/const.d.ts'. ========
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 [12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
index 6b9ecac620c8c..c288e686de02e 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
@@ -269,6 +269,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: package.json
+
 >> Screen clear
 [12:01:11 AM] File change detected. Starting incremental compilation...
 
@@ -389,6 +391,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: package.json
+
 >> Screen clear
 [12:01:18 AM] File change detected. Starting incremental compilation...
 
@@ -432,6 +436,7 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.d.cts' exist -
 File '/a/lib/package.json' does not exist.
 File '/a/package.json' does not exist.
 File '/package.json' does not exist.
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 [12:01:24 AM] Found 0 errors. Watching for file changes.
 
 
@@ -499,6 +504,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: package.json
+
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
@@ -623,6 +630,12 @@ export type { TheNum } from './const.cjs';
 //// [/user/username/projects/myproject/packages/pkg2/index.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: index.cts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: 
+
 >> Screen clear
 [12:01:39 AM] File change detected. Starting incremental compilation...
 
@@ -642,8 +655,16 @@ File '/user/username/projects/myproject/packages/pkg2/const.cts' exist - use it
 File '/a/lib/package.json' does not exist.
 File '/a/package.json' does not exist.
 File '/package.json' does not exist.
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: build/index.cjs
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: build/index.d.cts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/tsconfig.tsbuildinfo
 [12:01:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/packages/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/const.cjs
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/const.d.cts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/packages/pkg2/const.cts","/user/username/projects/myproject/packages/pkg2/index.cts"]
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
index 02b66ff4809e5..7f8216537386c 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
@@ -129,6 +129,8 @@ Input::
 //// [/user/username/projects/myproject/a.js] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
@@ -177,6 +179,8 @@ const x = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
@@ -184,6 +188,8 @@ Output::
 
 [12:00:44 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
index d2b736cdf81ce..1e6516c5fda81 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
@@ -81,6 +81,8 @@ Input::
 //// [/user/username/projects/myproject/a.js] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+
 >> Screen clear
 [12:00:31 AM] File change detected. Starting incremental compilation...
 
@@ -129,6 +131,8 @@ const x = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
index 45d8297c323a7..35395eee6a090 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
@@ -98,6 +98,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
@@ -157,6 +159,8 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
@@ -164,6 +168,24 @@ Output::
 
 [12:00:48 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
 [12:01:09 AM] Found 0 errors. Watching for file changes.
 
 
@@ -293,6 +315,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
@@ -305,6 +329,8 @@ Output::
 2 const a: string = 10;
         ~
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:22 AM] Found 1 error. Watching for file changes.
 
 
@@ -424,6 +450,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
 
@@ -481,6 +509,8 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
 
@@ -488,8 +518,13 @@ Output::
 
 [12:01:36 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:44 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -599,6 +634,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:52 AM] File change detected. Starting incremental compilation...
 
@@ -608,6 +645,10 @@ Output::
 
 [12:01:56 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:57 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
index c74f6d066f6ef..20b7ddc022482 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
@@ -98,6 +98,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
@@ -157,6 +159,8 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
@@ -164,6 +168,20 @@ Output::
 
 [12:00:48 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:05 AM] Found 0 errors. Watching for file changes.
 
 
@@ -236,6 +254,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
 
@@ -292,6 +312,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
@@ -349,6 +371,8 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
@@ -356,8 +380,11 @@ Output::
 
 [12:01:26 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:31 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
 [12:01:32 AM] Found 0 errors. Watching for file changes.
 
 
@@ -410,6 +437,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
@@ -419,6 +448,9 @@ Output::
 
 [12:01:40 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
 [12:01:41 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
index 9818a6cbf848d..64dfa065bf669 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
@@ -499,6 +499,8 @@ function someFn() { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -506,6 +508,11 @@ Output::
 
 [12:01:33 AM] Building project '/user/username/projects/sample1/logic/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:49 AM] Project 'sample1/tests/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:01:51 AM] Updating output timestamps of project '/user/username/projects/sample1/tests/tsconfig.json'...
@@ -660,6 +667,8 @@ export function someFn() { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
+
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
 
@@ -667,6 +676,11 @@ Output::
 
 [12:01:58 AM] Building project '/user/username/projects/sample1/logic/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:14 AM] Project 'sample1/tests/tsconfig.json' is out of date because oldest output 'sample1/tests/index.js' is older than newest input 'sample1/logic/tsconfig.json'
 
 [12:02:15 AM] Building project '/user/username/projects/sample1/tests/tsconfig.json'...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
index 191bed28c0501..8dc3cbee77b88 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
@@ -158,6 +158,8 @@ export var myClassWithError = class {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
@@ -209,6 +211,8 @@ export class myClass2 { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.ts
+
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
index b9b9221ded15b..fec6520daa708 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
@@ -158,6 +158,8 @@ export var myClassWithError = class {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
@@ -212,9 +214,17 @@ export var myClassWithError = class {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
+
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
index b5611cbdf261e..17cdd0f246f98 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
@@ -82,6 +82,8 @@ export class myClass2 { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.ts
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
index b95e38e00593a..68617fa5a81bb 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
@@ -85,9 +85,23 @@ export var myClassWithError = class {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithError.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithError.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithoutError.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithoutError.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
 [12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
index 0ec3a1c545cd5..2150943719b46 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
@@ -482,6 +482,8 @@ let y: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
+
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
@@ -490,6 +492,8 @@ Output::
 8 let y: string = 10;
       ~
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:31 AM] Found 1 error. Watching for file changes.
 
 
@@ -634,6 +638,8 @@ let x: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:35 AM] File change detected. Starting incremental compilation...
 
@@ -642,6 +648,8 @@ Output::
 5 let x: string = 10;
       ~
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 sample1/logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 8 let y: string = 10;
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
index 4ada4bc565f78..fe1de9ac155d1 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
@@ -481,6 +481,7 @@ let y: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
 sample1/logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
@@ -488,6 +489,8 @@ Output::
 8 let y: string = 10;
       ~
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:31 AM] Found 1 error. Watching for file changes.
 
 
@@ -632,6 +635,7 @@ let x: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
 [12:01:35 AM] File change detected. Starting incremental compilation...
 
 sample1/core/index.ts:5:5 - error TS2322: Type 'number' is not assignable to type 'string'.
@@ -639,6 +643,8 @@ Output::
 5 let x: string = 10;
       ~
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 sample1/logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 8 let y: string = 10;
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
index 826bc6fcd6615..2083cf6ee2fc9 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
@@ -178,6 +178,9 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
@@ -185,8 +188,18 @@ Output::
 
 [12:00:51 AM] Building project '/user/username/projects/sample1/core/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: outDir/file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: outDir/file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/tsconfig.tsbuildinfo
 [12:01:00 AM] Updating unchanged output timestamps of project '/user/username/projects/sample1/core/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
index 4f5076fc359ea..140331b70f444 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
@@ -193,6 +193,9 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
@@ -200,8 +203,22 @@ Output::
 
 [12:00:52 AM] Building project '/user/username/projects/sample1/core/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
 [12:01:03 AM] Updating unchanged output timestamps of project '/user/username/projects/sample1/core/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:07 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
index 9c056f5887166..ea3ed9e645707 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
@@ -221,6 +221,16 @@ Output::
 >> Screen clear
 [12:00:57 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
 
 
 Program root files: ["/user/username/projects/sample1/logic/index.ts"]
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
index 8ee1d321ec24f..e842fb4860564 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
@@ -181,9 +181,15 @@ export function createSomeObject(): SomeObject
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 App/app.ts:2:20 - error TS2551: Property 'message' does not exist on type 'SomeObject'. Did you mean 'message2'?
 
 2 createSomeObject().message;
@@ -322,9 +328,16 @@ export function createSomeObject(): SomeObject
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.ts
+
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/app 1 change:: app.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
index 5788471efc1e4..77ca2e55b4cb1 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
@@ -243,9 +243,16 @@ function myFunc() { return 10; }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/index.ts"]
@@ -346,6 +353,11 @@ Change:: Build logic
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.baseline.txt
 [12:01:25 AM] Found 0 errors. Watching for file changes.
 
 
@@ -495,9 +507,16 @@ function myFunc() { return 100; }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:29 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/index.ts"]
@@ -594,6 +613,11 @@ Change:: Build logic
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.baseline.txt
 [12:01:58 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index eb685e63ee0bc..a2b08a732c888 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -441,9 +441,22 @@ export const newFileConst = 30;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -558,6 +571,10 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:27 AM] Found 0 errors. Watching for file changes.
 
 
@@ -634,9 +651,19 @@ export class someClass2 { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -759,6 +786,10 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:47 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
index 345fc6474550c..9af35c779747f 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
@@ -445,9 +445,17 @@ export class someClass { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -565,6 +573,11 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:55 AM] Found 0 errors. Watching for file changes.
 
 
@@ -796,9 +809,17 @@ export function multiply(a: number, b: number) { return a * b; }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:59 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -908,6 +929,11 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1141,9 +1167,18 @@ export class someClass2 { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:02:47 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -1269,6 +1304,11 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:03:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
index b8e271ccd50fd..261f3c8c9663c 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -445,9 +445,21 @@ function foo() { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index a72f345ad4b19..24b29694504dc 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -475,9 +475,26 @@ export const newFileConst = 30;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+
 >> Screen clear
 [12:01:23 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -599,6 +616,10 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:39 AM] Found 0 errors. Watching for file changes.
 
 
@@ -675,9 +696,22 @@ export class someClass2 { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.ts
+
 >> Screen clear
 [12:01:43 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -807,6 +841,10 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:02:02 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
index 059ce163d3de5..cd2c46aa1f4b4 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
@@ -479,9 +479,19 @@ export class someClass { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -605,6 +615,11 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:08 AM] Found 0 errors. Watching for file changes.
 
 
@@ -836,9 +851,19 @@ export function multiply(a: number, b: number) { return a * b; }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:02:12 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -954,6 +979,11 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:56 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1187,9 +1217,20 @@ export class someClass2 { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:03:03 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -1321,6 +1362,11 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:03:48 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
index f7f454b20cef9..89f79ea78be8f 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -479,9 +479,23 @@ function foo() { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
index 0b05490ab3eb6..381cecd6c305e 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
@@ -71,9 +71,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
index f39bf560fe98d..439f17cc559c9 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
@@ -405,6 +405,9 @@ Output::
 
 [12:01:19 AM] Building project '/a/b/project2.tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: other.js
 [12:01:29 AM] Found 0 errors. Watching for file changes.
 
 
@@ -477,6 +480,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: alpha.tsconfig.json
+
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
 
@@ -486,6 +491,11 @@ Output::
 
 [12:01:38 AM] Updating unchanged output timestamps of project '/a/b/project1.tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.d.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: project1.tsconfig.tsbuildinfo
 
 
 Program root files: ["/a/b/commonFile1.ts","/a/b/commonFile2.ts"]
@@ -544,6 +554,9 @@ Output::
 
 [12:01:42 AM] Updating unchanged output timestamps of project '/a/b/project2.tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: other.js
 [12:01:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
index 8dc08e6383227..6fd94479da3a3 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
@@ -1841,6 +1841,8 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:06:32 AM] File change detected. Starting incremental compilation...
 
@@ -1848,94 +1850,164 @@ Output::
 
 [12:06:34 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:06:47 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:49 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:06:50 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:06:53 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:55 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:06:56 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:58 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:06:59 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 [12:07:02 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:07:05 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:07 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:07:08 AM] Project 'pkg8/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:10 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:07:11 AM] Project 'pkg9/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:13 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:07:14 AM] Project 'pkg10/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:16 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 [12:07:17 AM] Project 'pkg11/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:19 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:07:20 AM] Project 'pkg12/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:22 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:07:23 AM] Project 'pkg13/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:25 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:07:26 AM] Project 'pkg14/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:28 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:07:29 AM] Project 'pkg15/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:31 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 [12:07:32 AM] Project 'pkg16/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:34 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: tsconfig.tsbuildinfo
 [12:07:35 AM] Project 'pkg17/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:37 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: tsconfig.tsbuildinfo
 [12:07:38 AM] Project 'pkg18/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:40 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: tsconfig.tsbuildinfo
 [12:07:41 AM] Project 'pkg19/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:43 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: tsconfig.tsbuildinfo
 [12:07:44 AM] Project 'pkg20/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:46 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: tsconfig.tsbuildinfo
 [12:07:47 AM] Project 'pkg21/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:49 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: tsconfig.tsbuildinfo
 [12:07:50 AM] Project 'pkg22/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: tsconfig.tsbuildinfo
 [12:07:53 AM] Found 0 errors. Watching for file changes.
 
 
@@ -2375,6 +2447,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:07:56 AM] File change detected. Starting incremental compilation...
 
@@ -2382,6 +2456,10 @@ Output::
 
 [12:07:58 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -2606,30 +2684,45 @@ Output::
 
 [12:08:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:08:15 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:16 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:08:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:08:19 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:20 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:08:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:08:23 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:24 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:08:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:08:27 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:28 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:08:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -2862,30 +2955,45 @@ Output::
 
 [12:08:34 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:08:35 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:36 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:08:38 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:08:39 AM] Project 'pkg8/tsconfig.json' is out of date because oldest output 'pkg8/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:40 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
 [12:08:42 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:08:43 AM] Project 'pkg9/tsconfig.json' is out of date because oldest output 'pkg9/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:44 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
 [12:08:46 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:08:47 AM] Project 'pkg10/tsconfig.json' is out of date because oldest output 'pkg10/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:48 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 [12:08:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg6/index.ts"]
@@ -3118,30 +3226,45 @@ Output::
 
 [12:08:54 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:08:55 AM] Project 'pkg12/tsconfig.json' is out of date because oldest output 'pkg12/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:56 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
 [12:08:58 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:08:59 AM] Project 'pkg13/tsconfig.json' is out of date because oldest output 'pkg13/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:00 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
 [12:09:02 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:09:03 AM] Project 'pkg14/tsconfig.json' is out of date because oldest output 'pkg14/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:04 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
 [12:09:06 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:09:07 AM] Project 'pkg15/tsconfig.json' is out of date because oldest output 'pkg15/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:08 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 [12:09:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg11/index.ts"]
@@ -3374,30 +3497,45 @@ Output::
 
 [12:09:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: tsconfig.tsbuildinfo
 [12:09:15 AM] Project 'pkg17/tsconfig.json' is out of date because oldest output 'pkg17/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:16 AM] Building project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
 [12:09:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: tsconfig.tsbuildinfo
 [12:09:19 AM] Project 'pkg18/tsconfig.json' is out of date because oldest output 'pkg18/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:20 AM] Building project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
 [12:09:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: tsconfig.tsbuildinfo
 [12:09:23 AM] Project 'pkg19/tsconfig.json' is out of date because oldest output 'pkg19/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:24 AM] Building project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
 [12:09:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: tsconfig.tsbuildinfo
 [12:09:27 AM] Project 'pkg20/tsconfig.json' is out of date because oldest output 'pkg20/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:28 AM] Building project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
 [12:09:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg16/index.ts"]
@@ -3630,12 +3768,18 @@ Output::
 
 [12:09:35 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: tsconfig.tsbuildinfo
 [12:09:36 AM] Project 'pkg22/tsconfig.json' is out of date because oldest output 'pkg22/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:37 AM] Building project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
 [12:09:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: tsconfig.tsbuildinfo
 [12:09:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -3980,6 +4124,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:09:43 AM] File change detected. Starting incremental compilation...
 
@@ -3987,6 +4133,10 @@ Output::
 
 [12:09:45 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -4213,30 +4363,45 @@ Output::
 
 [12:10:01 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:10:02 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:03 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:10:05 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:10:06 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:07 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:10:09 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:10:10 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:11 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:10:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:10:14 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:15 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:10:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -4469,30 +4634,45 @@ Output::
 
 [12:10:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:10:22 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:23 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:10:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:10:26 AM] Project 'pkg8/tsconfig.json' is out of date because oldest output 'pkg8/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:27 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
 [12:10:29 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:10:30 AM] Project 'pkg9/tsconfig.json' is out of date because oldest output 'pkg9/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:31 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
 [12:10:33 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:10:34 AM] Project 'pkg10/tsconfig.json' is out of date because oldest output 'pkg10/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:35 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 [12:10:37 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg6/index.ts"]
@@ -4722,6 +4902,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:10:40 AM] File change detected. Starting incremental compilation...
 
@@ -4729,46 +4911,80 @@ Output::
 
 [12:10:42 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:10:55 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:10:57 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:10:58 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:00 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:11:01 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:03 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:11:04 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:06 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:11:07 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:09 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 [12:11:10 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:12 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:11:13 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:15 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:11:16 AM] Project 'pkg8/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:18 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:11:19 AM] Project 'pkg9/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:21 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:11:22 AM] Project 'pkg10/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:24 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -5021,30 +5237,45 @@ Output::
 
 [12:11:28 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:11:29 AM] Project 'pkg12/tsconfig.json' is out of date because oldest output 'pkg12/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:30 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
 [12:11:32 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:11:33 AM] Project 'pkg13/tsconfig.json' is out of date because oldest output 'pkg13/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:34 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
 [12:11:36 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:11:37 AM] Project 'pkg14/tsconfig.json' is out of date because oldest output 'pkg14/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:38 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
 [12:11:40 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:11:41 AM] Project 'pkg15/tsconfig.json' is out of date because oldest output 'pkg15/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:42 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 [12:11:44 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg11/index.ts"]
@@ -5274,6 +5505,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:11:48 AM] File change detected. Starting incremental compilation...
 
@@ -5281,6 +5514,10 @@ Output::
 
 [12:11:50 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -5510,30 +5747,45 @@ Output::
 
 [12:12:06 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:12:07 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:08 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:12:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:12:11 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:12 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:12:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:12:15 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:16 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:12:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:12:19 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:20 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:12:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -5766,30 +6018,45 @@ Output::
 
 [12:12:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:12:27 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:28 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:12:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:12:31 AM] Project 'pkg8/tsconfig.json' is out of date because oldest output 'pkg8/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:32 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
 [12:12:34 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:12:35 AM] Project 'pkg9/tsconfig.json' is out of date because oldest output 'pkg9/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:36 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
 [12:12:38 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:12:39 AM] Project 'pkg10/tsconfig.json' is out of date because oldest output 'pkg10/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:40 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 [12:12:42 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg6/index.ts"]
@@ -6022,30 +6289,45 @@ Output::
 
 [12:12:46 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:12:47 AM] Project 'pkg12/tsconfig.json' is out of date because oldest output 'pkg12/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:48 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
 [12:12:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:12:51 AM] Project 'pkg13/tsconfig.json' is out of date because oldest output 'pkg13/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:52 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
 [12:12:54 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:12:55 AM] Project 'pkg14/tsconfig.json' is out of date because oldest output 'pkg14/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:56 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
 [12:12:58 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:12:59 AM] Project 'pkg15/tsconfig.json' is out of date because oldest output 'pkg15/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:00 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 [12:13:02 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg11/index.ts"]
@@ -6278,30 +6560,45 @@ Output::
 
 [12:13:06 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: tsconfig.tsbuildinfo
 [12:13:07 AM] Project 'pkg17/tsconfig.json' is out of date because oldest output 'pkg17/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:08 AM] Building project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
 [12:13:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: tsconfig.tsbuildinfo
 [12:13:11 AM] Project 'pkg18/tsconfig.json' is out of date because oldest output 'pkg18/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:12 AM] Building project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
 [12:13:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: tsconfig.tsbuildinfo
 [12:13:15 AM] Project 'pkg19/tsconfig.json' is out of date because oldest output 'pkg19/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:16 AM] Building project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
 [12:13:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: tsconfig.tsbuildinfo
 [12:13:19 AM] Project 'pkg20/tsconfig.json' is out of date because oldest output 'pkg20/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:20 AM] Building project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
 [12:13:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg16/index.ts"]
@@ -6534,12 +6831,18 @@ Output::
 
 [12:13:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: tsconfig.tsbuildinfo
 [12:13:27 AM] Project 'pkg22/tsconfig.json' is out of date because oldest output 'pkg22/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:28 AM] Building project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
 [12:13:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: tsconfig.tsbuildinfo
 [12:13:31 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
index 9d39f6ac125d3..ae086cd85a384 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
@@ -281,6 +281,8 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
 
@@ -288,14 +290,24 @@ Output::
 
 [12:01:14 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:27 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:01:29 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:01:30 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:01:32 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:01:33 AM] Found 0 errors. Watching for file changes.
 
 
@@ -435,6 +447,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
@@ -442,6 +456,10 @@ Output::
 
 [12:01:38 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -546,12 +564,18 @@ Output::
 
 [12:01:54 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:01:55 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:01:56 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:58 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:01:59 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
index 38b7bfc6373ef..6930e6d52487c 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
@@ -437,6 +437,8 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
@@ -444,22 +446,38 @@ Output::
 
 [12:01:46 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:59 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:02:02 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:02:05 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:07 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:02:08 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:10 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:02:11 AM] Found 0 errors. Watching for file changes.
 
 
@@ -629,6 +647,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:02:14 AM] File change detected. Starting incremental compilation...
 
@@ -636,6 +656,10 @@ Output::
 
 [12:02:16 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -752,24 +776,36 @@ Output::
 
 [12:02:32 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:02:33 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:02:34 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:02:36 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:02:37 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:02:38 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:02:40 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:02:41 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:02:42 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:02:44 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:02:45 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
index 51f3aaa618d33..367c9b6f5961d 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
@@ -671,6 +671,8 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:02:32 AM] File change detected. Starting incremental compilation...
 
@@ -678,34 +680,59 @@ Output::
 
 [12:02:34 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:47 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:49 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:02:50 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:02:53 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:55 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:02:56 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:58 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:02:59 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:03:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 [12:03:02 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:03:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:03:05 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:03:07 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:03:08 AM] Found 0 errors. Watching for file changes.
 
 
@@ -920,6 +947,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:03:11 AM] File change detected. Starting incremental compilation...
 
@@ -927,6 +956,10 @@ Output::
 
 [12:03:13 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -1061,30 +1094,45 @@ Output::
 
 [12:03:29 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:03:30 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:31 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:03:33 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:03:34 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:35 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:03:37 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:03:38 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:39 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:03:41 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:03:42 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:43 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:03:45 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -1227,12 +1275,18 @@ Output::
 
 [12:03:49 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:03:50 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:51 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:03:53 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:03:54 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1397,6 +1451,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:03:57 AM] File change detected. Starting incremental compilation...
 
@@ -1404,6 +1460,10 @@ Output::
 
 [12:03:59 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -1540,30 +1600,45 @@ Output::
 
 [12:04:16 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:04:17 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:18 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:04:20 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:04:21 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:22 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:04:24 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:04:25 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:26 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:04:28 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:04:29 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:30 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:04:32 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -1703,6 +1778,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:04:35 AM] File change detected. Starting incremental compilation...
 
@@ -1710,26 +1787,45 @@ Output::
 
 [12:04:37 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:04:50 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:04:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:04:53 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:04:55 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:04:56 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:04:58 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:04:59 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:05:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:05:02 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:05:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -1877,12 +1973,18 @@ Output::
 
 [12:05:08 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:05:09 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:05:10 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:05:12 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:05:13 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
index 3458c8a45830f..96e1a7837424a 100644
--- a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
+++ b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
@@ -256,6 +256,8 @@ export function f2() { } // trailing
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: index.ts
+
 >> Screen clear
 [12:00:55 AM] File change detected. Starting incremental compilation...
 
@@ -263,12 +265,19 @@ Output::
 
 [12:00:57 AM] Building project '/user/username/projects/myproject/shared/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:10 AM] Project 'webpack/tsconfig.json' is out of date because oldest output 'webpack/index.js' is older than newest input 'shared/tsconfig.json'
 
 [12:01:11 AM] Building project '/user/username/projects/myproject/webpack/tsconfig.json'...
 
 [12:01:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/webpack/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/webpack 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/webpack 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/webpack 1 change:: tsconfig.tsbuildinfo
 [12:01:14 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
index ae54838ae4d6b..811a42de30c2e 100644
--- a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
+++ b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
@@ -264,6 +264,8 @@ export interface Session {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/reexport/src/pure 1 change:: session.ts
+
 >> Screen clear
 [12:01:07 AM] File change detected. Starting incremental compilation...
 
@@ -429,6 +431,8 @@ export interface Session {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/reexport/src/pure 1 change:: session.ts
+
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
index 9aebd0d53e615..db2348e0bb6b5 100644
--- a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
+++ b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
@@ -229,24 +229,28 @@ Output::
 
 [12:01:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:14 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:15 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:18 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:19 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:22 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:23 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:01:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -411,18 +415,21 @@ Output::
 
 [12:01:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:40 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:41 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:44 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:45 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
index ad4d9d4891d81..11ea03a188998 100644
--- a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
@@ -232,24 +232,28 @@ Output::
 
 [12:01:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:14 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:15 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:18 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:19 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:22 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:23 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:01:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -419,18 +423,21 @@ Output::
 
 [12:01:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:40 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:41 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:44 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:45 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
index b2c561112eb81..13eaa8fcc6a5b 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
@@ -71,8 +71,10 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: f.ts
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry::  1 change:: f.js
 [12:00:23 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
index b096bac970057..37dbaf9360641 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
@@ -70,8 +70,10 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: f.ts
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry::  1 change:: f.js
 [12:00:23 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
index 102a3122368ca..32537ebf8b9f1 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
@@ -75,9 +75,15 @@ var b = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 rename:: file.ts
+sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 rename:: file.ts
+sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 change:: 
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 change:: file.js
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
index 9567f0deb6e50..10c8410f08eef 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
@@ -109,9 +109,14 @@ export function Foo() { return 10; }export function foo2() { return 2; }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.ts
+
 >> Screen clear
 [12:00:29 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f3.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
@@ -178,9 +183,13 @@ export function Foo() { return 10; }export function foo2() { return 2; }export f
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f2.js
 [12:00:49 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
index 18c5c07ceb7cc..49c83ee1c7b6a 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
@@ -139,9 +139,12 @@ export var T: number;export function Foo() { };
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
 a/b/globalFile3.ts:1:1 - error TS1208: 'globalFile3.ts' cannot be compiled under '--isolatedModules' because it is considered a global script file. Add an import, export, or an empty 'export {}' statement to make it a module.
 
 1 interface GlobalFoo { age: number }
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
index 04f23c2aaa5a2..6c16f70ec573f 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
@@ -138,9 +138,12 @@ export var T: number;export function Foo() { };
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: out.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
index b5c71000f714a..c34cc2418dea2 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
@@ -135,9 +135,15 @@ export var T: number;export function Foo() { };
 //// [/a/b/file1Consumer2.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: file1Consumer2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
index f4707855b3345..fdf42df7712dc 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
@@ -137,9 +137,18 @@ import {Foo} from "./moduleFile1"; let y = Foo();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: file1Consumer3.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: file1Consumer3.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:00:52 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
index c11c863a1663d..351f027b7190b 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
@@ -134,9 +134,12 @@ export let y = Foo();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 a/b/file1Consumer1.ts:1:16 - error TS2304: Cannot find name 'Foo'.
 
 1 export let y = Foo();
@@ -205,9 +208,13 @@ export var T: number;export function Foo() { };
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
 a/b/file1Consumer1.ts:1:16 - error TS2304: Cannot find name 'Foo'.
 
 1 export let y = Foo();
@@ -281,9 +288,12 @@ import {Foo} from "./moduleFile1";let y = Foo();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
+
 >> Screen clear
 [12:00:57 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
@@ -347,9 +357,14 @@ export let y = Foo();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 a/b/file1Consumer1.ts:1:9 - error TS2305: Module '"./moduleFile1"' has no exported member 'Foo'.
 
 1 import {Foo} from "./moduleFile1";let y = Foo();
@@ -435,9 +450,15 @@ export var T: number;export function Foo() { };
 //// [/a/b/file1Consumer1.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:01:23 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:01:33 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
index 5e4bee56e5d58..66782a2e0b566 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
@@ -134,9 +134,14 @@ export var T: number;export function Foo() { };
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -208,9 +213,12 @@ export var T: number;export function Foo() { console.log('hi'); };
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
 a/b/moduleFile1.ts:1:46 - error TS2584: Cannot find name 'console'. Do you need to change your target library? Try changing the 'lib' compiler option to include 'dom'.
 
 1 export var T: number;export function Foo() { console.log('hi'); };
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
index cdbce1ebf488b..632852185fa0e 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
@@ -92,9 +92,12 @@ export var x = Foo();export var yy = Foo();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.ts
+
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.js
 a/b/referenceFile1.ts:1:22 - error TS6053: File '/a/b/moduleFile2.ts' not found.
 
 1 /// <reference path="./moduleFile2.ts" />
@@ -165,9 +168,15 @@ export var Foo4 = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.js
 a/b/referenceFile1.ts:2:16 - error TS2304: Cannot find name 'Foo'.
 
 2 export var x = Foo();export var yy = Foo();
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
index 9f19ac324e202..bc031dbd2623a 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
@@ -99,9 +99,13 @@ Input::
 //// [/a/b/moduleFile1.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.js
 a/b/referenceFile1.ts:1:22 - error TS6053: File '/a/b/moduleFile1.ts' not found.
 
 1 /// <reference path="./moduleFile1.ts" />
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
index dcabd0690ecbc..db1b85eef2955 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
@@ -134,9 +134,16 @@ interface GlobalFoo { age: number }var T2: string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: globalFile3.ts
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: globalFile3.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile2.js
 [12:00:53 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
index 46553cf38b57d..b3e5011bb110f 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
@@ -147,9 +147,13 @@ import {Foo} from "./moduleFile1"; export var y = 10;export var T: number;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1Consumer1.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -219,9 +223,14 @@ export var T: number;export function Foo() { };
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:01:02 AM] Found 0 errors. Watching for file changes.
 
 
@@ -299,9 +308,16 @@ import {Foo} from "./moduleFile1"; export var y = 10;export var T: number;export
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1Consumer1.js
 [12:01:21 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
index 7cd30bac07b7c..2737c00d55108 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
@@ -97,9 +97,13 @@ export var t1 = 10;export var t3 = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.ts
+
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file2.js
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
index 17fec0923ba94..3bf69033301de 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
@@ -86,9 +86,13 @@ let x = 11
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
+
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b.js
 [12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
@@ -144,9 +148,13 @@ let xy = 11
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b.js
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
index 422ae9350d56d..a3b210b6c55a7 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
@@ -77,9 +77,12 @@ let x = 11
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
+
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -130,9 +133,12 @@ let xy = 11
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
index dec712bb5bd5b..57728b97c5077 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
@@ -77,9 +77,12 @@ let x = 11
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
+
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -130,9 +133,12 @@ let xy = 11
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
index 59d6f8709809e..aa692ee55e945 100644
--- a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
+++ b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
@@ -86,6 +86,8 @@ var zz30 = 100;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/rootfolder/project/scripts 1 rename:: TypeScript.ts
+
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
index 588dd0314619b..4272cbcea36af 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,6 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
@@ -109,6 +111,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
@@ -169,6 +174,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
@@ -229,6 +237,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
index 3c4a303ac4d75..18518fb78ed74 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
@@ -134,9 +134,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -214,9 +219,13 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -291,9 +300,13 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
index f6870d4839f63..7c1d44cfc35a1 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,9 +184,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
 [12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
@@ -263,9 +270,13 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:04 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:11 AM] Found 0 errors. Watching for file changes.
 
 
@@ -333,9 +344,13 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:22 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index 1bf3370f68001..4e3a6ee79324b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -363,9 +381,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -373,6 +394,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -495,6 +517,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -552,11 +576,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -667,6 +696,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index 8f309c9a27f38..53d8f55173640 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -97,6 +97,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -156,9 +158,25 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
@@ -229,6 +247,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
@@ -285,6 +305,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -342,9 +364,12 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
@@ -399,6 +424,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 79e6631c3f518..9133600506473 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,6 +40,10 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -113,6 +117,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
@@ -173,6 +180,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
@@ -233,6 +243,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
index 373706d52b51b..66f8cda0d13a7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,9 +151,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:00:55 AM] Found 0 errors. Watching for file changes.
 
 
@@ -230,9 +236,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:59 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
@@ -309,9 +321,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index a56820f7ba866..212fde67d6fcf 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,9 +214,15 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -312,9 +318,15 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:11 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -410,9 +422,15 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index 7a3452236305e..1ed125b0faf66 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -174,6 +174,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -233,11 +235,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -379,9 +403,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -389,6 +416,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -512,6 +540,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -569,11 +599,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -686,6 +722,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index a660578a35d28..acd31dd9f41a7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -97,6 +97,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -156,9 +158,31 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
@@ -243,6 +267,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -299,6 +325,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
@@ -356,9 +384,13 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -414,6 +446,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
index 631343058a2df..a823ee84d13ec 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,6 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
@@ -109,6 +111,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
@@ -176,6 +181,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
@@ -238,6 +246,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
index ef905fec9f71d..80b3e7ab6f5b6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
@@ -134,9 +134,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -214,9 +219,13 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:00:57 AM] Found 0 errors. Watching for file changes.
 
 
@@ -288,9 +297,13 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
index ab0c14cc99bcc..7908db053821c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,9 +184,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
 [12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
@@ -263,9 +270,13 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:04 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -353,9 +364,13 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:22 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
index 388c3ea98bdb6..b0a79435ec614 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
@@ -178,6 +178,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -237,11 +239,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -367,9 +385,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -377,6 +398,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -498,6 +520,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -555,11 +579,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -669,6 +698,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
index 5b49bc9b5c4fd..f600fe003dd92 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
@@ -103,6 +103,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -162,9 +164,25 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
@@ -235,6 +253,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
@@ -291,6 +311,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -348,9 +370,12 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
@@ -405,6 +430,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
index 699571df19343..1c951a2e9282a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,6 +40,10 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -113,9 +117,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -181,9 +190,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
@@ -244,9 +258,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
index 1c4a21d2285bb..4193ca00dcef2 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,9 +151,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -238,9 +245,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:18 AM] Found 0 errors. Watching for file changes.
 
 
@@ -320,9 +334,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:22 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index c21f835e5b510..076f55957da12 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,9 +214,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:13 AM] Found 0 errors. Watching for file changes.
 
 
@@ -302,9 +310,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -406,9 +422,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:59 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
index 03fa4e8f54925..a9e15a098daa1 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -377,9 +401,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -387,6 +414,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -509,6 +537,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -566,11 +596,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -682,6 +718,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
index b3308300226e6..502b157b6c520 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
@@ -97,6 +97,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -156,9 +158,31 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
@@ -243,6 +267,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -299,6 +325,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
@@ -356,9 +384,13 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -414,6 +446,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
index 66f60506f1f5a..d5a6c8568da35 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,14 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -178,11 +184,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -307,11 +320,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -436,11 +456,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:02 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
index 1dd6ac58db846..a3606cfd1fe1c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
@@ -203,9 +203,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -213,6 +219,7 @@ Output::
 
 [12:00:53 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -361,9 +368,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -371,6 +383,7 @@ Output::
 
 [12:01:10 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -516,9 +529,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -526,6 +544,7 @@ Output::
 
 [12:01:27 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 1bcca5eaac7e8..9c299deb465c9 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -328,11 +328,20 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:07 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -503,11 +512,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:24 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -669,11 +684,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:41 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index ed442af297e49..49931f851f2e9 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -363,9 +381,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -373,6 +394,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -495,6 +517,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -552,11 +576,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -667,6 +696,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index 6d1212b6674c5..05db41a17298a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -363,9 +381,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -373,6 +394,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -495,6 +517,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -552,11 +576,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -667,6 +696,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
index df8601c2f13a0..9a9a3900fb9de 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,16 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -180,11 +188,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -307,11 +322,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:53 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -434,11 +456,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
index 3416312008eda..8ffe146b50c9c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -218,11 +218,19 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:02 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -364,11 +372,19 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:25 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -510,11 +526,19 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index ba092a2792a08..8dc8c3f723eef 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -356,9 +356,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -377,6 +384,7 @@ Output::
 
 [12:01:14 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -596,9 +604,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -617,6 +632,7 @@ Output::
 
 [12:01:37 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -836,9 +852,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -857,6 +880,7 @@ Output::
 
 [12:02:00 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index 6e2a98a4df712..04450f6526029 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -174,6 +174,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -233,11 +235,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -379,9 +403,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -389,6 +416,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -512,6 +540,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -569,11 +599,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -686,6 +722,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index 6ce359f78c7bf..c06900663a077 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -174,6 +174,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -233,11 +235,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -379,9 +403,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -389,6 +416,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -512,6 +540,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -569,11 +599,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -686,6 +722,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
index 4b76ba3f74523..a9adc01739724 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,14 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -175,9 +181,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -185,6 +196,8 @@ Output::
 
 [12:00:40 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -320,11 +333,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -448,9 +468,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -458,6 +483,8 @@ Output::
 
 [12:01:02 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
index 6b6265e4062da..14141643f1bbb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
@@ -200,9 +200,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -210,6 +216,7 @@ Output::
 
 [12:00:53 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -355,11 +362,17 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:10 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -495,9 +508,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -505,6 +523,7 @@ Output::
 
 [12:01:27 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 0bd997cf7d85b..6b17086fc49d7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -325,11 +325,20 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:07 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -497,9 +506,14 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -518,6 +532,7 @@ Output::
 
 [12:01:24 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -728,11 +743,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:41 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
index 194267bbfe50b..a8a79d5331b90 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
@@ -178,6 +178,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -237,11 +239,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -367,9 +385,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -377,6 +398,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -498,6 +520,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -555,11 +579,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -669,6 +698,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
index ce00016b8efec..5d757c9ff666b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
@@ -178,6 +178,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -237,11 +239,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -367,9 +385,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -377,6 +398,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -498,6 +520,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -555,11 +579,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -669,6 +698,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
index a8dc692ec8683..02a69a4b949ce 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,16 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -179,9 +187,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -189,6 +204,8 @@ Output::
 
 [12:00:45 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -325,11 +342,20 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -454,9 +480,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -464,6 +497,8 @@ Output::
 
 [12:01:13 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
index da962daca7abb..404c159553e53 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
@@ -217,9 +217,17 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -227,6 +235,7 @@ Output::
 
 [12:01:05 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -382,11 +391,20 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:31 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -530,9 +548,17 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -540,6 +566,7 @@ Output::
 
 [12:01:57 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 932f6e6d7b252..edfc5817c9add 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -355,11 +355,21 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -539,9 +549,18 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -560,6 +579,7 @@ Output::
 
 [12:01:49 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -784,11 +804,21 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:02:18 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
index d0a4d0f318392..9b8c6f9dae650 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -377,9 +401,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -387,6 +414,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -509,6 +537,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -566,11 +596,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -682,6 +718,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
index d8a4f56d04260..45751dc922034 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -377,9 +401,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -387,6 +414,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -509,6 +537,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -566,11 +596,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -682,6 +718,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
index 2fcab61a09b4e..415be8cbf8d7c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,14 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -175,9 +181,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -185,6 +196,8 @@ Output::
 
 [12:00:40 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -320,11 +333,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -448,9 +468,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -458,6 +483,8 @@ Output::
 
 [12:01:02 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
index 26cd3ba63c1ae..84163b27c9ad1 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
@@ -200,9 +200,13 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -210,6 +214,7 @@ Output::
 
 [12:00:47 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -356,11 +361,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -495,9 +505,13 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -505,6 +519,7 @@ Output::
 
 [12:01:15 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 1ce4cd7ddf0e6..47e8cb014d611 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -325,11 +325,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:55 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -496,9 +501,13 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -517,6 +526,7 @@ Output::
 
 [12:01:09 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -728,11 +738,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:23 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
index 653445b31864a..5487cd16f8c0b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -172,6 +172,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -231,11 +233,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -361,9 +379,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -371,6 +392,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -492,6 +514,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -549,11 +573,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -663,6 +692,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
index 989ae3dbbb1ca..bdc2748c42373 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
@@ -172,6 +172,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -231,11 +233,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -361,9 +379,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -371,6 +392,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -492,6 +514,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -549,11 +573,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -663,6 +692,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
index acd5004cc0b66..787aa270209c2 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,16 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -179,9 +187,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -189,6 +204,8 @@ Output::
 
 [12:00:45 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -325,11 +342,20 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -454,9 +480,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -464,6 +497,8 @@ Output::
 
 [12:01:13 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
index b15e1527acddc..fbde7ff089812 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -217,9 +217,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -227,6 +234,7 @@ Output::
 
 [12:01:02 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -381,11 +389,19 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:25 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -528,9 +544,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -538,6 +561,7 @@ Output::
 
 [12:01:48 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index b635367da4bad..19a3b54610edd 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -355,11 +355,21 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -541,9 +551,18 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -562,6 +581,7 @@ Output::
 
 [12:01:49 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -788,11 +808,21 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:02:18 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index 8a2fffaedd3e0..adffac996df20 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -377,9 +401,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -387,6 +414,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -509,6 +537,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -566,11 +596,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -682,6 +718,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
index bed1bc6d9d617..39499bedd8dd7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -377,9 +401,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -387,6 +414,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -509,6 +537,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -566,11 +596,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -682,6 +718,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
index e10259bdb7999..4c9137b412ea7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,6 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
@@ -109,6 +111,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
@@ -176,6 +181,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
@@ -238,6 +246,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
index 77efd91c3c423..b13d120ad6507 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
@@ -134,9 +134,12 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -212,9 +215,12 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -285,9 +291,12 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 40a113914a8b5..23ec4494fa2f3 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,9 +184,12 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -259,9 +262,12 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -350,9 +356,12 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
index 2c894c145b09a..effe08a727e64 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -172,6 +172,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -231,11 +233,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -361,9 +379,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -371,6 +392,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -492,6 +514,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -549,11 +573,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -663,6 +692,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
index a0bbf83e0dc85..00d9bfbcc6f31 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
@@ -97,6 +97,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -156,9 +158,25 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
@@ -229,6 +247,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
@@ -285,6 +305,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -342,9 +364,12 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
@@ -399,6 +424,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 618fe53144a13..fd82ee72294b1 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,6 +40,10 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -113,9 +117,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -181,9 +190,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
@@ -244,9 +258,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
index dd21b663f9d48..f802f56f1c48b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,9 +151,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -237,9 +243,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:59 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
@@ -318,9 +330,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 08665de0850ed..9514448be65e7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,9 +214,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:01:13 AM] Found 0 errors. Watching for file changes.
 
 
@@ -304,9 +312,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -410,9 +426,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:01:59 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index 9e681e6599665..53e409de7fde5 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -377,9 +401,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -387,6 +414,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -509,6 +537,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -566,11 +596,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -682,6 +718,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
index 34f7d03b64896..66b5a94ca600a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
@@ -97,6 +97,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -156,9 +158,31 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
@@ -243,6 +267,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -299,6 +325,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
@@ -356,9 +384,13 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -414,6 +446,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
index dec29649773ce..fd59c5990215f 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
@@ -115,9 +115,13 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.ts
+
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: b.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 project/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
index 4503d40a300d3..0b28da762ec06 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
@@ -115,9 +115,13 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.ts
+
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: b.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 project/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
index d2f27653bed2a..8fcebef95b7ab 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
@@ -143,9 +143,12 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
index 9670b01db257f..1cb178832b5ef 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
@@ -131,9 +131,13 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
index 9d715495c3c4a..77774ae652950 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
@@ -97,9 +97,12 @@ import { logger } from "./Logger"; new logger();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: another.ts
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: another.js
 user/username/projects/myproject/another.ts:1:24 - error TS1261: Already included file name '/user/username/projects/myproject/Logger.ts' differs from file name '/user/username/projects/myproject/logger.ts' only in casing.
   The file is in the program because:
     Imported via "./Logger" from file '/user/username/projects/myproject/another.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
index b34869681bb6c..cc3f543daafd8 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
@@ -143,9 +143,12 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
index 61a08b485eff8..d652c222335c8 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
@@ -131,9 +131,13 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
index e54490bf6694b..a03d7beee386a 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
@@ -149,9 +149,12 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 b.ts:2:19 - error TS2792: Cannot find module './yX/a'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 2 import { a } from "./yX/a";
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
index c42e49cc01c79..4e8d9102a6b0d 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
@@ -36,6 +36,12 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: XY.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: link.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 b.ts:2:19 - error TS2307: Cannot find module './yX' or its corresponding type declarations.
 
 2 import { a } from "./yX";
@@ -139,9 +145,14 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
 b.ts:2:19 - error TS2307: Cannot find module './yX' or its corresponding type declarations.
 
 2 import { a } from "./yX";
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
index 23a93128bab68..a7a3d48e40fc2 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
@@ -151,9 +151,12 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
   The file is in the program because:
     Imported via "./Xy/a" from file '/user/username/projects/myproject/b.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
index dd0ca380d9f3e..cc6ae7be49c20 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
@@ -139,9 +139,13 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 b.ts:2:19 - error TS1149: File name '/user/username/projects/myproject/Xy.ts' differs from already included file name '/user/username/projects/myproject/XY.ts' only in casing.
   The file is in the program because:
     Matched by default include pattern '**/*'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
index b80e2134bce4b..d4c7b75e3583c 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
@@ -151,9 +151,12 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
   The file is in the program because:
     Imported via "./Xy/a" from file '/user/username/projects/myproject/b.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
index c97de6ce4280b..0c6cbe0e17602 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
@@ -139,9 +139,13 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 b.ts:2:19 - error TS1149: File name '/user/username/projects/myproject/Xy.ts' differs from already included file name '/user/username/projects/myproject/XY.ts' only in casing.
   The file is in the program because:
     Matched by default include pattern '**/*'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
index 8478461feaac8..e696b1e3b441b 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
@@ -142,9 +142,12 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: moduleA.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: moduleA.js
 moduleA.ts:2:40 - error TS1261: Already included file name '/user/username/projects/myproject/ModuleC.ts' differs from file name '/user/username/projects/myproject/moduleC.ts' only in casing.
   The file is in the program because:
     Imported via "./ModuleC" from file '/user/username/projects/myproject/moduleA.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
index 92a7dcac194b7..ba1320e8cec68 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
@@ -95,6 +95,11 @@ Input::
 //// [/user/username/projects/myproject/Logger.ts] file was renamed from file /user/username/projects/myproject/logger.ts
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: logger.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: Logger.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
index f97d3a05fb12e..16fd7a70eb79d 100644
--- a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
@@ -32,6 +32,8 @@ Output::
 >> Screen clear
 [12:00:33 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /users/username/projects/project/src 1 rename:: index.js
+sysLog:: watchPresentFileSystemEntry:: /users/username/projects/project/src 1 change:: 
 [12:00:38 AM] Found 0 errors. Watching for file changes.
 
 
@@ -176,6 +178,7 @@ Output::
 >> Screen clear
 [12:00:44 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /users/username/projects/project/src 1 change:: index.js
 src/index.ts:1:51 - error TS2339: Property 'foo' does not exist on type 'Result'.
 
 1 import classNames from "classnames"; classNames().foo;
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
index 8ab4f71d85f61..c9009919cbd8d 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
@@ -153,6 +153,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
+
 >> Screen clear
 [12:00:53 AM] File change detected. Starting incremental compilation...
 
@@ -180,6 +182,7 @@ File '/user/username/projects/myproject/node_modules/pkg2/build/other.tsx' does
 File '/user/username/projects/myproject/node_modules/pkg2/build/other.d.ts' exist - use it as a name resolution result.
 Resolving real path for '/user/username/projects/myproject/node_modules/pkg2/build/other.d.ts', result '/user/username/projects/myproject/packages/pkg2/build/other.d.ts'.
 ======== Module name 'pkg2' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/other.d.ts' with Package ID 'pkg2/build/other.d.ts@1.0.0'. ========
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 packages/pkg1/index.ts:1:15 - error TS2305: Module '"pkg2"' has no exported member 'TheNum'.
 
 1 import type { TheNum } from 'pkg2'
@@ -285,6 +288,7 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.ts' does not e
 File '/user/username/projects/myproject/packages/pkg2/build/const.tsx' does not exist.
 File '/user/username/projects/myproject/packages/pkg2/build/const.d.ts' exist - use it as a name resolution result.
 ======== Module name './const.js' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/const.d.ts'. ========
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 [12:01:05 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js
index 5ec25f7fcfe83..0c1b4d730ed84 100644
--- a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
+++ b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
@@ -99,6 +99,8 @@ Thing.fn();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /project 1 change:: src/index.ts
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
index 15a3e8bd3fa82..39756910bb7c8 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
@@ -101,6 +101,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
index 65462ae84baab..269eb38c46f33 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
@@ -78,6 +78,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
@@ -131,6 +133,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
index 4f47cd5f54f3c..30b1cb0e0312c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
@@ -72,6 +72,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
@@ -122,6 +124,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:23 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
index 22d57ffd06393..66d242d647884 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
@@ -74,9 +74,15 @@ let y = 1
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 [12:00:27 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
index 9be0097c5bedf..f5635e360db3c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
@@ -21,6 +21,8 @@ Output::
 >> Screen clear
 [12:00:13 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/file1.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
 a/b/file1.ts:1:20 - error TS2307: Cannot find module './moduleFile' or its corresponding type declarations.
 
 1 import * as T from "./moduleFile"; T.bar();
@@ -75,6 +77,9 @@ export function bar() { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/moduleFile.ts
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
+
 >> Screen clear
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
index 4ef78e41a9881..3d5c9ba773fd5 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
@@ -74,9 +74,15 @@ let y = 1
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: f2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: f2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
 [12:00:27 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
index 48b958db8510f..58860e5eb1776 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
@@ -79,9 +79,14 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 rename:: file2.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 change:: 
+
 >> Screen clear
 [12:00:29 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 rename:: file2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
index 1d1e3a97eda54..1875f9e0907dc 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
@@ -76,9 +76,12 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
 a/b/f1.ts:1:1 - error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
 
 1 export {}
diff --git a/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js b/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
index 8ce89bda343d1..9fcee78a9ddbd 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
@@ -84,6 +84,8 @@ Input::
 //// [/a/b/tsconfig.json] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
 error TS5083: Cannot read file '/a/b/tsconfig.json'.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
index c5b9c128afc0b..caef1045d34e2 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
@@ -83,9 +83,12 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /src 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /src 1 change:: app.js
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
index c24a8fc88e321..d6c7a106c6db5 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
@@ -27,6 +27,8 @@ Output::
 >> Screen clear
 [12:00:17 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/c/app.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/c
 a/b/c/app.ts:2:25 - error TS2305: Module '"./module"' has no exported member 'f'.
 
 2                 import {f} from "./module"
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
index a10797617e9a4..0a759aac1e818 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
@@ -125,6 +125,7 @@ Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/f1.js
 a/b/f1.ts:1:15 - error TS7016: Could not find a declaration file for module './f2'. '/a/b/f2.js' implicitly has an 'any' type.
 
 1 export * from "./f2"
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
index 233d8635a3ebe..cdf207a5bbbed 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
@@ -125,6 +125,7 @@ Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/f1.js
 a/b/f1.ts:1:15 - error TS7016: Could not find a declaration file for module './f2'. '/a/b/f2.js' implicitly has an 'any' type.
 
 1 export * from "./f2"
diff --git a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
index 1dd28f2ed0021..c5357521539e3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
@@ -92,9 +92,13 @@ let y = 1;let xy = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.ts
+
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 a/b/commonFile1.ts
@@ -155,9 +159,13 @@ Input::
 //// [/a/b/commonFile2.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 a/b/commonFile1.ts
@@ -207,9 +215,14 @@ let y = 1
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 a/b/commonFile1.ts
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
index f44279fbd6495..72aa414b481b3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
@@ -96,9 +96,22 @@ export function bar() { };
 //// [/a/b/moduleFile.js] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
 a/b/file1.ts:1:20 - error TS2307: Cannot find module './moduleFile' or its corresponding type declarations.
 
 1 import * as T from "./moduleFile"; T.bar();
@@ -168,9 +181,21 @@ export function bar() { };
 //// [/a/b/moduleFile1.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
 [12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
index af64ecde0727f..31fbce47cdc2e 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
@@ -90,6 +90,7 @@ Output::
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/file1.js
 a/b/file1.ts:1:20 - error TS2307: Cannot find module './moduleFile' or its corresponding type declarations.
 
 1 import * as T from "./moduleFile"; T.bar();
@@ -137,6 +138,11 @@ export function bar() { };
 //// [/a/b/moduleFile1.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/moduleFile1.ts
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/moduleFile.ts
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
index 4166f16b7541b..134197ee82e55 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
@@ -97,9 +97,12 @@ import { x } from "../b";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: lib/a.js
 a.ts:3:19 - error TS6059: File '/user/username/projects/b.ts' is not under 'rootDir' '/user/username/projects/myproject'. 'rootDir' is expected to contain all source files.
 
 3 import { x } from "../b";
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
index ef020d04628d3..8a219eb58dac9 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
@@ -93,9 +93,12 @@ export const a: number = 1
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 b.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const b: string = a;
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
index e3fc789404c06..ea3e7d8a79e4b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
@@ -130,6 +130,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
@@ -262,9 +264,20 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: decls/src/file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: decls/src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
index 620c42fa2a32c..ffbe73076dae4 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
@@ -262,9 +262,18 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: build/src/file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: decls/src/file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: decls/src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
index 6800711e1a42f..ac766fcc23d15 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
@@ -254,9 +254,16 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: build/src/file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: build/src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
index 7b96140fceb23..9bb0fde4fd3d9 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
@@ -249,9 +249,15 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: build/outFile.js
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
index 1b21f2ca83fcc..f63f2b5bcd268 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
@@ -130,6 +130,10 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
@@ -262,9 +266,22 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
index 1b80ab46e46ad..8aac3f60d10db 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
@@ -130,6 +130,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
@@ -254,9 +256,18 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
index f379dda653e4b..c61858b2e2a6c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
@@ -101,6 +101,7 @@ Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
index d6571f1f2e3e3..44fe5e4d0d401 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
@@ -112,6 +112,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:23 AM] File change detected. Starting incremental compilation...
 
@@ -166,9 +168,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry::  1 change:: b.js
+sysLog:: watchPresentFileSystemEntry::  1 change:: a.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
index b95366558d2e8..6e93c7990902a 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
@@ -86,9 +86,12 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:20 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry::  1 change:: a.js
 a.ts:2:21 - error TS2610: 'prop' is defined as an accessor in class 'C', but is overridden here in 'D' as an instance property.
 
 2 class D extends C { prop = 1; }
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
index d49eea56c629a..847c3c7b569e2 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
@@ -75,9 +75,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
index c29e44a58d755..0753cecb7b8ac 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
@@ -99,9 +99,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
@@ -152,9 +156,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 b.ts:1:1 - error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
 
 1 import {C} from './a';
@@ -218,9 +226,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
index 9412986369c3c..715cf188f0664 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
@@ -85,6 +85,8 @@ export default test;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
@@ -145,6 +147,8 @@ export default test;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
@@ -200,6 +204,8 @@ export default test;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
@@ -265,6 +271,8 @@ export default test;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
index ce71c8e888fa1..f67d6d31917e5 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
@@ -77,9 +77,15 @@ declare module 'a' {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 a.ts:2:8 - error TS2300: Duplicate identifier 'foo'.
 
 2   type foo = number;
@@ -153,9 +159,13 @@ Input::
 //// [/user/username/projects/myproject/b.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
index 2bbd474f5792b..a26275602e707 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
@@ -93,6 +93,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
index e8849a90830dc..d502751b50f3b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
@@ -88,6 +88,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
index 80b6a9c592175..81b8bb6b4644e 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
@@ -75,6 +75,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
@@ -127,6 +129,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
@@ -179,6 +183,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
index 410db4b1367bf..d37446191d686 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
@@ -27,6 +27,8 @@ Output::
 >> Screen clear
 [12:00:23 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 a.ts:1:23 - error TS2732: Cannot find module './data.json'. Consider using '--resolveJsonModule' to import module with '.json' extension.
 
 1 import * as data from './data.json'
@@ -87,9 +89,14 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js b/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
index 6cf84cd6877f2..37336d2bd5d0f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
@@ -75,9 +75,16 @@ var a = 10;
 //// [/home/username/project/src/file1.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 rename:: src/file1.ts
+sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 change:: src
+sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 rename:: src/file2.ts
+sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 change:: src
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 rename:: src/file2.js
+sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 change:: src
 [12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js b/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
index 2c6d1ff7e912d..baaba896465c3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
@@ -84,9 +84,11 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 Reloading new file names and options
 Synchronizing program
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
index 27c0214047124..7ff8a428bca12 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
@@ -112,9 +112,11 @@ import * as M from "folder1/module1";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 rename:: module3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.ts :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.ts :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 change:: 
 Reloading new file names and options
 Synchronizing program
 [12:00:41 AM] File change detected. Starting incremental compilation...
@@ -123,9 +125,11 @@ CreatingProgramWith::
   roots: ["/user/username/projects/myproject/client/folder1/module1.ts","/user/username/projects/myproject/client/linktofolder2/module2.ts","/user/username/projects/myproject/client/linktofolder2/module3.ts"]
   options: {"baseUrl":"/user/username/projects/myproject/client","paths":{"*":["*"]},"pathsBasePath":"/user/username/projects/myproject","watch":true,"project":"/user/username/projects/myproject","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/client/linktofolder2/module3.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 rename:: module3.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.js :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/folder2/module3.js
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.js :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 change:: 
 [12:00:45 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
index 56df7dd17e823..88a0ed0a9447c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
@@ -168,9 +168,11 @@ class class3 {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 Reloading new file names and options
 [12:00:45 AM] File change detected. Starting incremental compilation...
@@ -248,9 +250,11 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
@@ -259,8 +263,12 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"watch":true,"project":"/user/username/projects/myproject/projects/project2/tsconfig.json","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -373,12 +381,16 @@ declare class file {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp/file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: temp
 
 
 WatchedFiles::
@@ -421,9 +433,11 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -433,6 +447,9 @@ CreatingProgramWith::
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 error TS6053: File '/user/username/projects/myproject/projects/project1/class3.d.ts' not found.
   The file is in the program because:
     Output from referenced project '/user/username/projects/myproject/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
@@ -444,6 +461,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
 
 [12:01:18 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -547,9 +565,11 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -558,8 +578,12 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"watch":true,"project":"/user/username/projects/myproject/projects/project2/tsconfig.json","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:01:35 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
index 4b564de1611fd..4ae590d53c6a5 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
@@ -103,6 +103,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
@@ -158,6 +160,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
@@ -218,6 +222,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
@@ -282,6 +288,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
@@ -341,6 +349,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:51 AM] File change detected. Starting incremental compilation...
 
@@ -396,6 +406,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:56 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
index 82a4e297d8331..8116d53563f09 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
@@ -536,6 +536,13 @@ function foo() { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
 
@@ -718,6 +725,13 @@ export declare function gfoo(): void;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+
 >> Screen clear
 [12:01:51 AM] File change detected. Starting incremental compilation...
 
@@ -977,6 +991,15 @@ export declare function gfoo(): void;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: decls
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: decls/index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: decls
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+
 >> Screen clear
 [12:02:22 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
index f78e22fda1784..7828d8cdf1a5c 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
@@ -346,9 +346,21 @@ export declare function gfoo(): void;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
 
@@ -446,9 +458,15 @@ export class A {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 rename:: nrefs
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: nrefs
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: tsconfig.json
+
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:01:32 AM] Found 0 errors. Watching for file changes.
 
 
@@ -545,9 +563,12 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: tsconfig.json
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:01:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -644,6 +665,9 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
@@ -739,6 +763,9 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:01:50 AM] File change detected. Starting incremental compilation...
 
@@ -821,9 +848,17 @@ Input::
 //// [/user/username/projects/transitiveReferences/b/tsconfig.json] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 c/tsconfig.json:1:84 - error TS6053: File '/user/username/projects/transitiveReferences/b' not found.
 
 1 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"references":[{"path":"../b"}]}
@@ -909,9 +944,14 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
+
 >> Screen clear
 [12:02:03 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:02:07 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1006,9 +1046,16 @@ Input::
 //// [/user/username/projects/transitiveReferences/a/tsconfig.json] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/a 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/a 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
+
 >> Screen clear
 [12:02:09 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: index.js
 b/tsconfig.json:1:96 - error TS6053: File '/user/username/projects/transitiveReferences/a' not found.
 
 1 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"references":[{"path":"../a"}]}
@@ -1105,6 +1152,10 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
+
 >> Screen clear
 [12:02:17 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
index 1deb26f2868c5..82edc629807b8 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
@@ -342,6 +342,12 @@ export declare function gfoo(): void;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
@@ -438,6 +444,10 @@ export class A {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 rename:: nrefs
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: nrefs
+
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
@@ -628,6 +638,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
@@ -718,6 +730,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:01:50 AM] File change detected. Starting incremental compilation...
 
@@ -795,9 +809,14 @@ Input::
 //// [/user/username/projects/transitiveReferences/b/tsconfig.json] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
 c/tsconfig.json:1:105 - error TS6053: File '/user/username/projects/transitiveReferences/b' not found.
 
 1 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"files":["index.ts"],"references":[{"path":"../b"}]}
@@ -881,6 +900,10 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
+
 >> Screen clear
 [12:02:03 AM] File change detected. Starting incremental compilation...
 
@@ -974,9 +997,14 @@ Input::
 //// [/user/username/projects/transitiveReferences/a/tsconfig.json] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
+
 >> Screen clear
 [12:02:09 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: index.js
 b/tsconfig.json:1:117 - error TS6053: File '/user/username/projects/transitiveReferences/a' not found.
 
 1 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"files":["index.ts"],"references":[{"path":"../a"}]}
@@ -1070,6 +1098,10 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
+
 >> Screen clear
 [12:02:17 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
index ec5ba33068815..5a8350b7b0b53 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
@@ -24,6 +24,10 @@ Output::
 >> Screen clear
 [12:00:15 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: f1.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: d/f0.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d
 a/d/f0.ts:1:17 - error TS2306: File '/a/f1.ts' is not a module.
 
 1 import {x} from "f1"
@@ -93,9 +97,12 @@ import {x} from "f1"
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.ts
+
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.js
 a/d/f0.ts:1:17 - error TS2306: File '/a/f1.ts' is not a module.
 
 1 import {x} from "f1"
@@ -162,9 +169,12 @@ import {x} from "f2"
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.ts
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.js
 a/d/f0.ts:1:17 - error TS2792: Cannot find module 'f2'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 1 import {x} from "f2"
@@ -221,9 +231,13 @@ import {x} from "f1"
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.ts
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: f1.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.js
 a/d/f0.ts:1:17 - error TS2306: File '/a/f1.ts' is not a module.
 
 1 import {x} from "f1"
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
index 4983e21f361fc..8711b2767ab29 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
@@ -87,6 +87,19 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: .cache
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/.cache
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: .cache/babel-loader
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/.cache/babel-loader
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: .cache
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/.cache
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: .cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: .cache/babel-loader
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/.cache/babel-loader
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
index 85f14d17a90e3..25ea2f7ce25cd 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
@@ -27,6 +27,8 @@ Output::
 >> Screen clear
 [12:00:27 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/test.js
+sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -81,6 +83,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/node_modules/.cache
+sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject/node_modules
+sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/node_modules/.cache/babel-loader
+sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject/node_modules/.cache
+sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts
+sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject/node_modules/.cache/babel-loader
+
 
 WatchedFiles::
 /user/username/projects/myproject/test.ts:
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
index fe2afcf3739ba..26781409f1eb0 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
@@ -21,6 +21,9 @@ Output::
 >> Screen clear
 [12:00:11 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: foo.js
+sysLog:: watchPresentFileSystemEntry::  1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
 a/foo.ts:1:17 - error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 1 import {x} from "bar"
@@ -82,9 +85,15 @@ export const y = 1;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.ts
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: bar.d.ts
+sysLog:: watchPresentFileSystemEntry::  1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
+
 >> Screen clear
 [12:00:20 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.js
 [12:00:24 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
index a7a69e9bbf8fb..c76354103ea07 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
@@ -24,6 +24,8 @@ Output::
 >> Screen clear
 [12:00:13 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: foo.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
 [12:00:16 AM] Found 0 errors. Watching for file changes.
 
 
@@ -76,9 +78,13 @@ Input::
 //// [/a/bar.d.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: bar.d.ts
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
+
 >> Screen clear
 [12:00:18 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.js
 a/foo.ts:1:17 - error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 1 import {x} from "bar"
@@ -129,9 +135,14 @@ export const y = 1;export const x = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: bar.d.ts
+sysLog:: watchPresentFileSystemEntry::  1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
+
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.js
 [12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
index e1320878fe8ab..e967c45ba9ff9 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
@@ -87,11 +87,37 @@ declare namespace myapp {
 
 
 Output::
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/node_modules 1 /user/username/projects/myproject/node_modules:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types/package.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types/package.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp/ts-types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp/ts-types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp/ts-types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp/ts-types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types/types/somefile.define.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types/types/somefile.define.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp/ts-types/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp/ts-types/types
 
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: lib/app.js
 [12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
index 4f41981f7b4e6..5692c7f704e20 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
@@ -138,83 +138,124 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/base.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/base.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/globals.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/globals.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/globals.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/index.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/index.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/ts3.6/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/ts3.6/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/ts3.6/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node/ts3.6
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node/ts3.6
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node/ts3.6
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/node_modules/@types/node/ts3.6
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: 
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
 Reloading new file names and options
 Synchronizing program
 [12:00:48 AM] File change detected. Starting incremental compilation...
@@ -227,6 +268,7 @@ FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/base.d.ts 250 undefined Source file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/index.d.ts 250 undefined Source file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/package.json 2000 undefined package.json file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: worker.js
 worker.ts:1:1 - error TS2580: Cannot find name 'process'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`.
 
 1 process.on("uncaughtException");
@@ -280,36 +322,53 @@ export const foo = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: 
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: mocha
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/mocha
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/mocha
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: mocha/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/mocha/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/mocha/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: mocha
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/mocha
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/mocha
 Reloading new file names and options
 Synchronizing program
 [12:00:59 AM] File change detected. Starting incremental compilation...
@@ -372,16 +431,22 @@ Change:: npm ci step three: create atTypes node folder
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types
 Reloading new file names and options
 Synchronizing program
 [12:01:03 AM] File change detected. Starting incremental compilation...
@@ -462,24 +527,36 @@ declare namespace NodeJS {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/node_modules/@types/node/ts3.6
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 Scheduling update
 Reloading new file names and options
 Synchronizing program
@@ -493,6 +570,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 250 undefined Source file
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 250 undefined Source file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/node/package.json 2000 undefined package.json file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: worker.js
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
index 8dea1d815e32b..66f5bb5c292a2 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
@@ -87,8 +87,28 @@ declare module "fs" {
 
 
 Output::
+sysLog:: watchMissingFileSystemEntry:: /a/b/node_modules 1 /a/b/node_modules:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /a/b/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: 
+sysLog:: watchMissingFileSystemEntry:: /a/b/node_modules/@types 1 /a/b/node_modules/@types:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /a/b/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: node
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: @types
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: node/package.json
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types/node/package.json
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: node/index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types/node/index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: @types/node
 
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
index 682abdee15795..4d3c1fce6dee6 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
@@ -79,8 +79,19 @@ export {}
 //// [/user/username/projects/myproject/node_modules2/@types/qqq/index.d.ts] deleted
 
 Output::
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/node_modules 1 /user/username/projects/myproject/node_modules:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 /user/username/projects/myproject/node_modules/@types:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /user/username/projects/myproject/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: qqq
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/qqq
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: qqq/index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/qqq/index.d.ts
 
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
index 57076cf6e3a80..89d98c62aeb81 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
@@ -112,6 +112,8 @@ module1("hello");
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b/projects/myproject/src 1 change:: file1.ts
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js b/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
index 059b90a59d1d9..725e197cdc986 100644
--- a/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
+++ b/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
@@ -85,9 +85,14 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: other2.vue
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+
 >> Screen clear
 [12:00:31 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: other2.vue.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
index 7f5292f597fa5..83286fc8537e3 100644
--- a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
+++ b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
@@ -79,6 +79,8 @@ export const x = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: main.ts
+
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
index 96a7d413c8cba..765829369f0c3 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
@@ -168,9 +168,11 @@ class class3 {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 Loading config file: /user/username/projects/myproject/projects/project1/tsconfig.json
 [12:00:45 AM] File change detected. Starting incremental compilation...
@@ -248,9 +250,11 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
@@ -259,8 +263,12 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -373,12 +381,16 @@ declare class file {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp/file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: temp
 
 
 WatchedFiles::
@@ -421,9 +433,11 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -433,6 +447,9 @@ CreatingProgramWith::
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 error TS6053: File '/user/username/projects/myproject/projects/project1/class3.d.ts' not found.
   The file is in the program because:
     Output from referenced project '/user/username/projects/myproject/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
@@ -444,6 +461,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
 
 [12:01:18 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -547,9 +565,11 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -558,8 +578,12 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:01:35 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
index 83f887411c96f..7b25ba1e0ca65 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
@@ -168,9 +168,11 @@ class class3 {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 Loading config file: /user/username/projects/myproject/projects/project1/tsconfig.json
 [12:00:45 AM] File change detected. Starting incremental compilation...
@@ -180,8 +182,12 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:00:55 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -294,12 +300,16 @@ declare class file {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp/file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: temp
 
 
 WatchedFiles::
@@ -341,9 +351,11 @@ declare class class3 {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 
 
 WatchedFiles::
diff --git a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
index 4c5a5c4a2a475..995a6339443b7 100644
--- a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
+++ b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
@@ -74,6 +74,11 @@ const y =10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: bar.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: bar.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
index c4141fa5d0453..6713120866d4b 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -98,6 +98,7 @@ export declare function foo2(): string;
 
 
 Output::
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename::  true foo.ts /foo.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
@@ -167,14 +168,18 @@ export declare function foo(): string;
 
 
 Output::
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename::  true foo.ts /foo.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.ts:: Changing watcher to MissingFileSystemEntryWatcher
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 /user/username/projects/myproject/foo.ts:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename::  true foo.ts /foo.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
index 534e0e7161485..70cfa01d2725e 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
@@ -39,8 +39,10 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 {"watchFile":4} Source file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: main.js true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -99,30 +101,39 @@ export function foo2(): string;
 
 
 Output::
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 /user/username/projects/myproject/foo.d.ts:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 Synchronizing program
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js true myproject /myproject
 main.ts:1:10 - error TS2724: '"./foo"' has no exported member named 'foo'. Did you mean 'foo2'?
 
 1 import { foo } from "./foo"; foo();
@@ -183,30 +194,39 @@ export function foo(): string;
 
 
 Output::
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 /user/username/projects/myproject/foo.d.ts:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 Synchronizing program
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js true myproject /myproject
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
index 129e3ec2f790a..56bf549b473a1 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -98,6 +98,7 @@ export declare function foo2(): string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename:: 
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
@@ -166,9 +167,11 @@ export declare function foo(): string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename:: 
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename:: 
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
index 3e010dd8582e3..559a7dba4e83f 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
@@ -76,9 +76,19 @@ Input::
 //// [/a/username/project/src/file1.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 rename:: file1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/username/project 1 change:: src
+sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 rename:: file2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/username/project 1 change:: src
+
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 rename:: file2.js
+sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/username/project 1 change:: src
 [12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
index 571d2cfcb72c0..71b85643f6825 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
@@ -62,6 +62,8 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myprojec
 FileWatcher:: Added:: WatchInfo: /home/user/projects/myproject/node_modules/reala/package.json 2000 undefined package.json file
 DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /home/user/projects/myproject/src 1 rename:: file.js
+sysLog:: watchPresentFileSystemEntry:: /home/user/projects/myproject/src 1 change:: 
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 undefined Wild card directory
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
index 5f9740db448a6..9c8046450650b 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
@@ -126,9 +126,17 @@ export const x = 10;
 //// [/user/username/projects/myproject/src/file2.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: renamed.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: file1.js
 error TS6053: File '/user/username/projects/myproject/src/file2.ts' not found.
   The file is in the program because:
     Matched by default include pattern '**/*'
@@ -184,6 +192,9 @@ Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 rename:: renamed.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: dist
 user/username/projects/myproject/src/file1.ts:1:19 - error TS2307: Cannot find module './file2' or its corresponding type declarations.
 
 1 import { x } from "./file2";
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
index 59faa168aad77..df4cbd683cf3e 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
@@ -134,6 +134,10 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -174,6 +178,12 @@ Output::
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 rename:: file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: dist
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 rename:: file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: dist
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
index ae378d1bdd38e..58e1a7dd71c2f 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
@@ -27,6 +27,8 @@ Output::
 >> Screen clear
 [12:00:29 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file1.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
@@ -124,9 +126,21 @@ Input::
 //// [/user/username/projects/myproject/node_modules/file2/index.d.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/file2 1 rename:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/file2 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: file2
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/file2 1 rename:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: file2
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: file1.js
 user/username/projects/myproject/src/file1.ts:1:19 - error TS2307: Cannot find module 'file2' or its corresponding type declarations.
 
 1 import { x } from "file2";
@@ -229,6 +243,10 @@ Change:: Start npm install
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -258,6 +276,10 @@ Change:: npm install folder creation of file2
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: file2
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -290,6 +312,8 @@ export const x = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: file2
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -384,6 +408,7 @@ Output::
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: file1.js
 [12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
index 48df9d0d09b1d..ee3b0cb995f2d 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
@@ -78,6 +78,8 @@ var zz30 = 100;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.ts
+
 
 WatchedFiles::
 /a/b/node_modules/@types:
@@ -100,6 +102,8 @@ Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
 [12:00:33 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
index 37d63eb42a659..25f4f1161f65f 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
@@ -97,6 +97,8 @@ var zz30 = 100;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.ts
+
 
 WatchedFiles::
 /a/b/node_modules/@types:
@@ -119,6 +121,8 @@ Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
index 8a4d9817b7fc4..ff40d55d26c25 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
@@ -50,8 +50,10 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Failed Lookup Locations
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/bar/package.json 2000 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} package.json file
 ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Wild card directory
@@ -117,6 +119,9 @@ Input::
 //// [/user/username/projects/myproject/node_modules/bar/fooBar.d.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/bar/fooBar.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
index 17445c13fa132..ecbbd881cd06e 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
@@ -52,6 +52,8 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/bar/package.json 2000 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} package.json file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Wild card directory
@@ -171,6 +173,8 @@ export function temp(): string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/bar 1 change:: temp
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
index d633c62afa8a6..396906bdcf693 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
@@ -36,6 +36,8 @@ Output::
 >> Screen clear
 [12:00:37 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -144,6 +146,8 @@ export function temp(): string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/bar 1 change:: temp
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
index 77eb64d93475c..ca464f91011d0 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
@@ -36,6 +36,8 @@ Output::
 >> Screen clear
 [12:00:37 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -99,6 +101,9 @@ Input::
 //// [/user/username/projects/myproject/node_modules/bar/fooBar.d.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/bar/fooBar.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
index 88d25cde1fcc5..75ef71c5a1607 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
@@ -52,8 +52,10 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/bar/package.json 2000 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} package.json file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Wild card directory
@@ -119,6 +121,9 @@ export function fooBar(): string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: bar/foo.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar/foo.d.ts
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
index 54ce05a590cbf..e516101ea4f18 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
@@ -36,6 +36,8 @@ Output::
 >> Screen clear
 [12:00:37 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -99,6 +101,9 @@ export function fooBar(): string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: bar/foo.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar/foo.d.ts
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:

From f2c710cd25e6f9d47478e0afeec3d569b0868b1c Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 25 May 2022 12:39:29 -0700
Subject: [PATCH 10/15] Revert "Some logging for debugging further"

This reverts commit dd2164ac83666725c4cc58e0223425b10530d682.
---
 src/compiler/sys.ts                           |  15 +-
 .../demo/updates-with-bad-reference.js        |   2 -
 .../demo/updates-with-circular-reference.js   |   2 -
 ...for-changes-to-package-json-main-fields.js |   5 -
 ...t-correctly-with-cts-and-mts-extensions.js |  21 --
 ...n-no-files-are-emitted-with-incremental.js |   6 -
 ...when-watching-when-no-files-are-emitted.js |   4 -
 ...mit-any-files-on-error-with-incremental.js |  41 ---
 .../does-not-emit-any-files-on-error.js       |  32 --
 .../incremental-updates-in-verbose-mode.js    |  14 -
 .../when-file-with-no-error-changes.js        |   4 -
 ...ing-errors-only-changed-file-is-emitted.js |  10 -
 .../when-file-with-no-error-changes.js        |   2 -
 ...ixing-error-files-all-files-are-emitted.js |  14 -
 .../when-preserveWatchOutput-is-not-used.js   |   8 -
 ...veWatchOutput-is-passed-on-command-line.js |   6 -
 ...e-of-program-emit-with-outDir-specified.js |  13 -
 ...r-recompilation-because-of-program-emit.js |  17 -
 ...tches-config-files-that-are-not-present.js |  10 -
 ...e-down-stream-project-and-then-fixes-it.js |  13 -
 ...ncing-project-even-for-non-local-change.js |  24 --
 ...le-is-added,-and-its-subsequent-updates.js |  31 --
 ...hanges-and-reports-found-errors-message.js |  40 ---
 ...not-start-build-of-referencing-projects.js |  12 -
 ...le-is-added,-and-its-subsequent-updates.js |  38 ---
 ...hanges-and-reports-found-errors-message.js |  46 ---
 ...not-start-build-of-referencing-projects.js |  14 -
 ...hen-noUnusedParameters-changes-to-false.js |   4 -
 .../works-with-extended-source-files.js       |  13 -
 ...hen-there-are-23-projects-in-a-solution.js | 303 ------------------
 ...when-there-are-3-projects-in-a-solution.js |  24 --
 ...when-there-are-5-projects-in-a-solution.js |  36 ---
 ...when-there-are-8-projects-in-a-solution.js | 102 ------
 .../publicApi/with-custom-transformers.js     |   9 -
 .../reexport/Reports-errors-correctly.js      |   4 -
 ...e-projects-with-single-watcher-per-file.js |   7 -
 .../same-file-in-multiple-projects.js         |   7 -
 .../createWatchOfConfigFile.js                |   2 -
 ...Result-on-WatchCompilerHostOfConfigFile.js |   2 -
 ...s-deleted-and-created-as-part-of-change.js |   6 -
 .../should-emit-specified-file.js             |   9 -
 ...elf-if-'--isolatedModules'-is-specified.js |   3 -
 ...-if-'--out'-or-'--outFile'-is-specified.js |   3 -
 ...should-be-up-to-date-with-deleted-files.js |   6 -
 ...-be-up-to-date-with-newly-created-files.js |   9 -
 ...-to-date-with-the-reference-map-changes.js |  21 --
 ...les-referencing-it-if-its-shape-changed.js |   8 -
 .../should-detect-non-existing-code-file.js   |   9 -
 .../should-detect-removed-code-file.js        |   4 -
 ...ll-files-if-a-global-file-changed-shape.js |   7 -
 ...ould-return-cascaded-affected-file-list.js |  16 -
 ...fine-for-files-with-circular-references.js |   4 -
 .../config-does-not-have-out-or-outFile.js    |   8 -
 .../config-has-out.js                         |   6 -
 .../config-has-outFile.js                     |   6 -
 ...-recursive-directory-watcher-is-invoked.js |   2 -
 .../errors-for-.d.ts-change.js                |  11 -
 .../errors-for-.ts-change.js                  |  13 -
 ...g-a-deep-multilevel-import-that-changes.js |  15 -
 .../with-noEmitOnError-with-incremental.js    |  31 --
 .../with-noEmitOnError.js                     |  27 --
 .../errors-for-.d.ts-change.js                |  13 -
 .../errors-for-.ts-change.js                  |  18 --
 ...g-a-deep-multilevel-import-that-changes.js |  18 --
 .../with-noEmitOnError-with-incremental.js    |  38 ---
 .../with-noEmitOnError.js                     |  34 --
 .../errors-for-.d.ts-change.js                |  11 -
 .../errors-for-.ts-change.js                  |  13 -
 ...g-a-deep-multilevel-import-that-changes.js |  15 -
 .../with-noEmitOnError-with-incremental.js    |  31 --
 .../default/with-noEmitOnError.js             |  27 --
 .../errors-for-.d.ts-change.js                |  19 --
 .../errors-for-.ts-change.js                  |  21 --
 ...g-a-deep-multilevel-import-that-changes.js |  24 --
 .../with-noEmitOnError-with-incremental.js    |  38 ---
 .../defaultAndD/with-noEmitOnError.js         |  34 --
 .../errors-for-.d.ts-change.js                |  27 --
 .../errors-for-.ts-change.js                  |  19 --
 ...g-a-deep-multilevel-import-that-changes.js |  21 --
 .../with-noEmitOnError-with-incremental.js    |  31 --
 .../with-noEmitOnError.js                     |  31 --
 .../errors-for-.d.ts-change.js                |  29 --
 .../errors-for-.ts-change.js                  |  24 --
 ...g-a-deep-multilevel-import-that-changes.js |  24 --
 .../with-noEmitOnError-with-incremental.js    |  38 ---
 .../with-noEmitOnError.js                     |  38 ---
 .../errors-for-.d.ts-change.js                |  27 --
 .../errors-for-.ts-change.js                  |  19 --
 ...g-a-deep-multilevel-import-that-changes.js |  21 --
 .../with-noEmitOnError-with-incremental.js    |  31 --
 .../incremental/default/with-noEmitOnError.js |  31 --
 .../errors-for-.d.ts-change.js                |  35 --
 .../errors-for-.ts-change.js                  |  27 --
 ...g-a-deep-multilevel-import-that-changes.js |  30 --
 .../with-noEmitOnError-with-incremental.js    |  38 ---
 .../defaultAndD/with-noEmitOnError.js         |  38 ---
 .../errors-for-.d.ts-change.js                |  27 --
 .../errors-for-.ts-change.js                  |  15 -
 ...g-a-deep-multilevel-import-that-changes.js |  15 -
 .../with-noEmitOnError-with-incremental.js    |  31 --
 .../isolatedModules/with-noEmitOnError.js     |  31 --
 .../errors-for-.d.ts-change.js                |  35 --
 .../errors-for-.ts-change.js                  |  24 --
 ...g-a-deep-multilevel-import-that-changes.js |  30 --
 .../with-noEmitOnError-with-incremental.js    |  38 ---
 .../isolatedModulesAndD/with-noEmitOnError.js |  38 ---
 .../errors-for-.d.ts-change.js                |  11 -
 .../errors-for-.ts-change.js                  |   9 -
 ...g-a-deep-multilevel-import-that-changes.js |   9 -
 .../with-noEmitOnError-with-incremental.js    |  31 --
 .../isolatedModules/with-noEmitOnError.js     |  27 --
 .../errors-for-.d.ts-change.js                |  19 --
 .../errors-for-.ts-change.js                  |  18 --
 ...g-a-deep-multilevel-import-that-changes.js |  24 --
 .../with-noEmitOnError-with-incremental.js    |  38 ---
 .../isolatedModulesAndD/with-noEmitOnError.js |  34 --
 ...n-Windows-style-drive-root-is-lowercase.js |   4 -
 ...n-Windows-style-drive-root-is-uppercase.js |   4 -
 ...ry-symlink-target-and-import-match-disk.js |   3 -
 ...le-symlink-target-and-import-match-disk.js |   4 -
 ...nging-module-name-with-different-casing.js |   3 -
 ...target-matches-disk-but-import-does-not.js |   3 -
 ...target-matches-disk-but-import-does-not.js |   4 -
 ...link-target,-and-disk-are-all-different.js |   3 -
 ...link-target,-and-disk-are-all-different.js |  11 -
 ...link-target-agree-but-do-not-match-disk.js |   3 -
 ...link-target-agree-but-do-not-match-disk.js |   4 -
 ...k-but-directory-symlink-target-does-not.js |   3 -
 ...s-disk-but-file-symlink-target-does-not.js |   4 -
 ...ative-information-file-location-changes.js |   3 -
 ...hen-renaming-file-with-different-casing.js |   5 -
 .../editing-module-augmentation-watch.js      |   3 -
 ...for-changes-to-package-json-main-fields.js |   4 -
 .../esm-mode-file-is-edited.js                |   2 -
 ...configFile-contents-when-options-change.js |   2 -
 ...rts-errors-when-the-config-file-changes.js |   4 -
 ...nostics-when-'--noUnusedLabels'-changes.js |   4 -
 ...-a-configured-program-without-file-list.js |   6 -
 ...hould-remove-the-module-not-found-error.js |   5 -
 ...ot-files-has-changed-(new-file-on-disk).js |   6 -
 ...-root-files-has-changed-through-include.js |   5 -
 .../programUpdates/change-module-to-none.js   |   3 -
 .../programUpdates/config-file-is-deleted.js  |   2 -
 ...s-changes-in-lib-section-of-config-file.js |   3 -
 .../create-watch-without-config-file.js       |   2 -
 ...eleted-files-affect-project-structure-2.js |   1 -
 .../deleted-files-affect-project-structure.js |   1 -
 .../handle-recreated-files-correctly.js       |  13 -
 ...tore-the-states-for-configured-projects.js |  25 --
 ...estore-the-states-for-inferred-projects.js |   6 -
 ...rors-correctly-with-file-not-in-rootDir.js |   3 -
 ...s-errors-correctly-with-isolatedModules.js |   3 -
 .../declarationDir-is-specified.js            |  13 -
 ...-outDir-and-declarationDir-is-specified.js |   9 -
 .../when-outDir-is-specified.js               |   7 -
 .../with-outFile.js                           |   6 -
 ...e-is-specified-with-declaration-enabled.js |  17 -
 .../without-outDir-or-outFile-is-specified.js |  11 -
 ...odule-resolution-changes-in-config-file.js |   1 -
 ...tes-diagnostics-and-emit-for-decorators.js |   6 -
 ...it-when-useDefineForClassFields-changes.js |   3 -
 .../updates-emit-on-jsx-option-change.js      |   4 -
 ...mit-when-importsNotUsedAsValues-changes.js |  12 -
 ...on-emit-is-disabled-in-compiler-options.js |   8 -
 ...when-ambient-modules-of-program-changes.js |  10 -
 ...orceConsistentCasingInFileNames-changes.js |   2 -
 ...s-errors-when-noErrorTruncation-changes.js |   2 -
 ...es-errors-when-strictNullChecks-changes.js |   6 -
 ...solution-when-resolveJsonModule-changes.js |   7 -
 ...and-new-file-is-added-as-part-of-change.js |   7 -
 .../when-creating-extensionless-file.js       |   2 -
 ...n-creating-new-file-in-symlinked-folder.js |   4 -
 ...file-is-added-to-the-referenced-project.js |  24 --
 ...ibCheck-and-skipDefaultLibCheck-changes.js |  12 -
 .../on-sample-project.js                      |  23 --
 ...-different-folders-with-no-files-clause.js |  51 ---
 ...nsitive-references-in-different-folders.js |  32 --
 .../tscWatch/resolutionCache/caching-works.js |  14 -
 .../watch-with-configFile.js                  |  13 -
 .../watch-without-configFile.js               |   9 -
 .../loads-missing-files-from-disk.js          |   9 -
 ...module-goes-missing-and-then-comes-back.js |  11 -
 ...are-global-and-installed-at-later-point.js |  26 --
 ...-no-notification-from-fs-for-index-file.js |  78 -----
 ...le-resolution-changes-to-ambient-module.js |  20 --
 ...der-that-already-contains-@types-folder.js |  11 -
 ...rogram-with-files-from-external-library.js |   2 -
 .../extraFileExtensions-are-supported.js      |   5 -
 ...createSemanticDiagnosticsBuilderProgram.js |   2 -
 ...ing-useSourceOfProjectReferenceRedirect.js |  24 --
 ...-host-implementing-getParsedCommandLine.js |  12 -
 ...-timesouts-on-host-program-gets-updated.js |   5 -
 ...e-occurs-when-file-is-still-on-the-disk.js |   5 -
 ...when-using-file-watching-thats-on-inode.js |  20 --
 ...e-occurs-when-file-is-still-on-the-disk.js |   3 -
 ...rectory-when-renaming-file-in-subfolder.js |  10 -
 ...ymlinks-to-folders-in-recursive-folders.js |   2 -
 ...hronous-watch-directory-renaming-a-file.js |  11 -
 ...ory-with-outDir-and-declaration-enabled.js |  10 -
 .../with-non-synchronous-watch-directory.js   |  25 --
 ...lt-as-fixed-chunk-size-watch-file-works.js |   4 -
 .../using-fixed-chunk-size-polling.js         |   4 -
 ...eDirectories-option-extendedDiagnostics.js |   5 -
 ...-directory-watching-extendedDiagnostics.js |   4 -
 ...ption-with-recursive-directory-watching.js |   4 -
 .../with-excludeDirectories-option.js         |   5 -
 ...excludeFiles-option-extendedDiagnostics.js |   5 -
 .../watchOptions/with-excludeFiles-option.js  |   5 -
 208 files changed, 2 insertions(+), 3422 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index fa59f3914c6d3..c0ab1065755a8 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1120,15 +1120,10 @@ namespace ts {
                         recursive,
                         inodeWatching ?
                             callbackChangingToMissingFileSystemEntry :
-                            (eventName, relativeFileName) => {
-
-                                sysLog(`sysLog:: watchPresentFileSystemEntry:: ${fileOrDirectory} ${entryKind} ${eventName}:: ${relativeFileName}`);
-                                callback(eventName, relativeFileName);
-                            }
+                            callback
                     );
                     // Watch the missing file or directory or error
                     presentWatcher.on("error", () => {
-                        sysLog(`sysLog:: watchPresentFileSystemEntry:: on Error ${fileOrDirectory} ${entryKind} rename, ""`);
                         callback("rename", "");
                         updateWatcher(watchMissingFileSystemEntry);
                     });
@@ -1145,7 +1140,6 @@ namespace ts {
             }
 
             function callbackChangingToMissingFileSystemEntry(event: "rename" | "change", relativeName: string | undefined) {
-                sysLog(`sysLog:: callbackChangingToMissingFileSystemEntry:: ${fileOrDirectory} ${entryKind} ${event}:: ${relativeName} ${inodeWatching} ${lastDirectoryPart} ${lastDirectoryPartWithDirectorySeparator}`);
                 callback(event, relativeName);
                 // because relativeName is not guaranteed to be correct we need to check on each rename with few combinations
                 // Eg on ubuntu while watching app/node_modules the relativeName is "node_modules" which is neither relative nor full path
@@ -1169,10 +1163,7 @@ namespace ts {
             function watchPresentFileSystemEntryWithFsWatchFile(): FileWatcher {
                 return watchFile(
                     fileOrDirectory,
-                    createFileWatcherCallback((eventName, relativeFileName) => {
-                        sysLog(`sysLog:: watchPresentFileSystemEntryWithFsWatchFile:: ${fileOrDirectory} ${entryKind} ${eventName}:: ${relativeFileName}`);
-                        callback(eventName, relativeFileName);
-                    }),
+                    createFileWatcherCallback(callback),
                     fallbackPollingInterval,
                     fallbackOptions
                 );
@@ -1186,9 +1177,7 @@ namespace ts {
                 return watchFile(
                     fileOrDirectory,
                     (_fileName, eventKind) => {
-                        sysLog(`sysLog:: watchMissingFileSystemEntry:: ${fileOrDirectory} ${entryKind} ${_fileName}:: ${eventKind}`);
                         if (eventKind === FileWatcherEventKind.Created && fileSystemEntryExists(fileOrDirectory, entryKind)) {
-                            sysLog(`sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher`);
                             callback("rename", "");
                             // Call the callback for current file or directory
                             // For now it could be callback for the inner directory creation,
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
index 7e24b0a5cde10..b36912f7aa3ec 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
@@ -433,8 +433,6 @@ export function lastElementOf<T>(arr: T[]): T | undefined {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/demo/core 1 change:: utilities.ts
-
 >> Screen clear
 [12:01:07 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
index be98b50cfe64c..e8f43afdbba83 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
@@ -216,8 +216,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/demo/core 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
index fc9e9b9d46051..757edf9d88cf3 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
@@ -278,8 +278,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
-
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
@@ -372,8 +370,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
-
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
@@ -418,7 +414,6 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.ts' does not e
 File '/user/username/projects/myproject/packages/pkg2/build/const.tsx' does not exist.
 File '/user/username/projects/myproject/packages/pkg2/build/const.d.ts' exist - use it as a name resolution result.
 ======== Module name './const.js' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/const.d.ts'. ========
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 [12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
index c288e686de02e..6b9ecac620c8c 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
@@ -269,8 +269,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: package.json
-
 >> Screen clear
 [12:01:11 AM] File change detected. Starting incremental compilation...
 
@@ -391,8 +389,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: package.json
-
 >> Screen clear
 [12:01:18 AM] File change detected. Starting incremental compilation...
 
@@ -436,7 +432,6 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.d.cts' exist -
 File '/a/lib/package.json' does not exist.
 File '/a/package.json' does not exist.
 File '/package.json' does not exist.
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 [12:01:24 AM] Found 0 errors. Watching for file changes.
 
 
@@ -504,8 +499,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: package.json
-
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
@@ -630,12 +623,6 @@ export type { TheNum } from './const.cjs';
 //// [/user/username/projects/myproject/packages/pkg2/index.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: index.cts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: 
-
 >> Screen clear
 [12:01:39 AM] File change detected. Starting incremental compilation...
 
@@ -655,16 +642,8 @@ File '/user/username/projects/myproject/packages/pkg2/const.cts' exist - use it
 File '/a/lib/package.json' does not exist.
 File '/a/package.json' does not exist.
 File '/package.json' does not exist.
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: build/index.cjs
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: build/index.d.cts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/tsconfig.tsbuildinfo
 [12:01:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/packages/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/const.cjs
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/const.d.cts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/packages/pkg2/const.cts","/user/username/projects/myproject/packages/pkg2/index.cts"]
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
index 7f8216537386c..02b66ff4809e5 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
@@ -129,8 +129,6 @@ Input::
 //// [/user/username/projects/myproject/a.js] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
@@ -179,8 +177,6 @@ const x = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
@@ -188,8 +184,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:44 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
index 1e6516c5fda81..d2b736cdf81ce 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
@@ -81,8 +81,6 @@ Input::
 //// [/user/username/projects/myproject/a.js] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-
 >> Screen clear
 [12:00:31 AM] File change detected. Starting incremental compilation...
 
@@ -131,8 +129,6 @@ const x = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
index 35395eee6a090..45d8297c323a7 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
@@ -98,8 +98,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
@@ -159,8 +157,6 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
@@ -168,24 +164,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:00:48 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
 [12:01:09 AM] Found 0 errors. Watching for file changes.
 
 
@@ -315,8 +293,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
@@ -329,8 +305,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 2 const a: string = 10;
         ~
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:22 AM] Found 1 error. Watching for file changes.
 
 
@@ -450,8 +424,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
 
@@ -509,8 +481,6 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
 
@@ -518,13 +488,8 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:36 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:44 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -634,8 +599,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:52 AM] File change detected. Starting incremental compilation...
 
@@ -645,10 +608,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:56 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:57 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
index 20b7ddc022482..c74f6d066f6ef 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
@@ -98,8 +98,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
@@ -159,8 +157,6 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
@@ -168,20 +164,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:00:48 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:05 AM] Found 0 errors. Watching for file changes.
 
 
@@ -254,8 +236,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
 
@@ -312,8 +292,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
@@ -371,8 +349,6 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
@@ -380,11 +356,8 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:26 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:31 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
 [12:01:32 AM] Found 0 errors. Watching for file changes.
 
 
@@ -437,8 +410,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
@@ -448,9 +419,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:40 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
 [12:01:41 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
index 64dfa065bf669..9818a6cbf848d 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
@@ -499,8 +499,6 @@ function someFn() { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -508,11 +506,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 c
 
 [12:01:33 AM] Building project '/user/username/projects/sample1/logic/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:49 AM] Project 'sample1/tests/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:01:51 AM] Updating output timestamps of project '/user/username/projects/sample1/tests/tsconfig.json'...
@@ -667,8 +660,6 @@ export function someFn() { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
-
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
 
@@ -676,11 +667,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 c
 
 [12:01:58 AM] Building project '/user/username/projects/sample1/logic/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:14 AM] Project 'sample1/tests/tsconfig.json' is out of date because oldest output 'sample1/tests/index.js' is older than newest input 'sample1/logic/tsconfig.json'
 
 [12:02:15 AM] Building project '/user/username/projects/sample1/tests/tsconfig.json'...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
index 8dc3cbee77b88..191bed28c0501 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
@@ -158,8 +158,6 @@ export var myClassWithError = class {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
@@ -211,8 +209,6 @@ export class myClass2 { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.ts
-
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
index fec6520daa708..b9b9221ded15b 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
@@ -158,8 +158,6 @@ export var myClassWithError = class {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
@@ -214,17 +212,9 @@ export var myClassWithError = class {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
-
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
index 17cdd0f246f98..b5611cbdf261e 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
@@ -82,8 +82,6 @@ export class myClass2 { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.ts
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
index 68617fa5a81bb..b95e38e00593a 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
@@ -85,23 +85,9 @@ export var myClassWithError = class {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithError.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithError.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithoutError.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithoutError.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
 [12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
index 2150943719b46..0ec3a1c545cd5 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
@@ -482,8 +482,6 @@ let y: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
-
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
@@ -492,8 +490,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 c
 8 let y: string = 10;
       ~
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:31 AM] Found 1 error. Watching for file changes.
 
 
@@ -638,8 +634,6 @@ let x: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:35 AM] File change detected. Starting incremental compilation...
 
@@ -648,8 +642,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 ch
 5 let x: string = 10;
       ~
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 sample1/logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 8 let y: string = 10;
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
index fe1de9ac155d1..4ada4bc565f78 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
@@ -481,7 +481,6 @@ let y: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
 sample1/logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
@@ -489,8 +488,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 c
 8 let y: string = 10;
       ~
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:31 AM] Found 1 error. Watching for file changes.
 
 
@@ -635,7 +632,6 @@ let x: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
 [12:01:35 AM] File change detected. Starting incremental compilation...
 
 sample1/core/index.ts:5:5 - error TS2322: Type 'number' is not assignable to type 'string'.
@@ -643,8 +639,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 ch
 5 let x: string = 10;
       ~
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 sample1/logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 8 let y: string = 10;
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
index 2083cf6ee2fc9..826bc6fcd6615 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
@@ -178,9 +178,6 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
@@ -188,18 +185,8 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 ch
 
 [12:00:51 AM] Building project '/user/username/projects/sample1/core/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: outDir/file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: outDir/file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/tsconfig.tsbuildinfo
 [12:01:00 AM] Updating unchanged output timestamps of project '/user/username/projects/sample1/core/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
index 140331b70f444..4f5076fc359ea 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
@@ -193,9 +193,6 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
@@ -203,22 +200,8 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 ch
 
 [12:00:52 AM] Building project '/user/username/projects/sample1/core/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
 [12:01:03 AM] Updating unchanged output timestamps of project '/user/username/projects/sample1/core/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:07 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
index ea3ed9e645707..9c056f5887166 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
@@ -221,16 +221,6 @@ Output::
 >> Screen clear
 [12:00:57 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
 
 
 Program root files: ["/user/username/projects/sample1/logic/index.ts"]
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
index e842fb4860564..8ee1d321ec24f 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
@@ -181,15 +181,9 @@ export function createSomeObject(): SomeObject
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 App/app.ts:2:20 - error TS2551: Property 'message' does not exist on type 'SomeObject'. Did you mean 'message2'?
 
 2 createSomeObject().message;
@@ -328,16 +322,9 @@ export function createSomeObject(): SomeObject
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.ts
-
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/app 1 change:: app.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
index 77ca2e55b4cb1..5788471efc1e4 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
@@ -243,16 +243,9 @@ function myFunc() { return 10; }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/index.ts"]
@@ -353,11 +346,6 @@ Change:: Build logic
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.baseline.txt
 [12:01:25 AM] Found 0 errors. Watching for file changes.
 
 
@@ -507,16 +495,9 @@ function myFunc() { return 100; }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:29 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/index.ts"]
@@ -613,11 +594,6 @@ Change:: Build logic
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.baseline.txt
 [12:01:58 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index a2b08a732c888..eb685e63ee0bc 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -441,22 +441,9 @@ export const newFileConst = 30;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -571,10 +558,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:27 AM] Found 0 errors. Watching for file changes.
 
 
@@ -651,19 +634,9 @@ export class someClass2 { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -786,10 +759,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:47 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
index 9af35c779747f..345fc6474550c 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
@@ -445,17 +445,9 @@ export class someClass { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -573,11 +565,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:55 AM] Found 0 errors. Watching for file changes.
 
 
@@ -809,17 +796,9 @@ export function multiply(a: number, b: number) { return a * b; }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:59 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -929,11 +908,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1167,18 +1141,9 @@ export class someClass2 { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:02:47 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -1304,11 +1269,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:03:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
index 261f3c8c9663c..b8e271ccd50fd 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -445,21 +445,9 @@ function foo() { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index 24b29694504dc..a72f345ad4b19 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -475,26 +475,9 @@ export const newFileConst = 30;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-
 >> Screen clear
 [12:01:23 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -616,10 +599,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:39 AM] Found 0 errors. Watching for file changes.
 
 
@@ -696,22 +675,9 @@ export class someClass2 { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.ts
-
 >> Screen clear
 [12:01:43 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -841,10 +807,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:02:02 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
index cd2c46aa1f4b4..059ce163d3de5 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
@@ -479,19 +479,9 @@ export class someClass { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -615,11 +605,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:08 AM] Found 0 errors. Watching for file changes.
 
 
@@ -851,19 +836,9 @@ export function multiply(a: number, b: number) { return a * b; }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:02:12 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -979,11 +954,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:56 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1217,20 +1187,9 @@ export class someClass2 { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:03:03 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -1362,11 +1321,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:03:48 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
index 89f79ea78be8f..f7f454b20cef9 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -479,23 +479,9 @@ function foo() { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
index 381cecd6c305e..0b05490ab3eb6 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
@@ -71,13 +71,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
index 439f17cc559c9..f39bf560fe98d 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
@@ -405,9 +405,6 @@ Output::
 
 [12:01:19 AM] Building project '/a/b/project2.tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: other.js
 [12:01:29 AM] Found 0 errors. Watching for file changes.
 
 
@@ -480,8 +477,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: alpha.tsconfig.json
-
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
 
@@ -491,11 +486,6 @@ sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: alpha.tsconfig.json
 
 [12:01:38 AM] Updating unchanged output timestamps of project '/a/b/project1.tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.d.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: project1.tsconfig.tsbuildinfo
 
 
 Program root files: ["/a/b/commonFile1.ts","/a/b/commonFile2.ts"]
@@ -554,9 +544,6 @@ Output::
 
 [12:01:42 AM] Updating unchanged output timestamps of project '/a/b/project2.tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: other.js
 [12:01:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
index 6fd94479da3a3..8dc08e6383227 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
@@ -1841,8 +1841,6 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:06:32 AM] File change detected. Starting incremental compilation...
 
@@ -1850,164 +1848,94 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:06:34 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:06:47 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:49 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:06:50 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:06:53 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:55 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:06:56 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:58 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:06:59 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 [12:07:02 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:07:05 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:07 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:07:08 AM] Project 'pkg8/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:10 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:07:11 AM] Project 'pkg9/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:13 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:07:14 AM] Project 'pkg10/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:16 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 [12:07:17 AM] Project 'pkg11/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:19 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:07:20 AM] Project 'pkg12/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:22 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:07:23 AM] Project 'pkg13/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:25 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:07:26 AM] Project 'pkg14/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:28 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:07:29 AM] Project 'pkg15/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:31 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 [12:07:32 AM] Project 'pkg16/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:34 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: tsconfig.tsbuildinfo
 [12:07:35 AM] Project 'pkg17/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:37 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: tsconfig.tsbuildinfo
 [12:07:38 AM] Project 'pkg18/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:40 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: tsconfig.tsbuildinfo
 [12:07:41 AM] Project 'pkg19/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:43 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: tsconfig.tsbuildinfo
 [12:07:44 AM] Project 'pkg20/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:46 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: tsconfig.tsbuildinfo
 [12:07:47 AM] Project 'pkg21/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:49 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: tsconfig.tsbuildinfo
 [12:07:50 AM] Project 'pkg22/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: tsconfig.tsbuildinfo
 [12:07:53 AM] Found 0 errors. Watching for file changes.
 
 
@@ -2447,8 +2375,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:07:56 AM] File change detected. Starting incremental compilation...
 
@@ -2456,10 +2382,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:07:58 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -2684,45 +2606,30 @@ Output::
 
 [12:08:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:08:15 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:16 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:08:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:08:19 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:20 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:08:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:08:23 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:24 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:08:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:08:27 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:28 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:08:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -2955,45 +2862,30 @@ Output::
 
 [12:08:34 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:08:35 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:36 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:08:38 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:08:39 AM] Project 'pkg8/tsconfig.json' is out of date because oldest output 'pkg8/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:40 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
 [12:08:42 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:08:43 AM] Project 'pkg9/tsconfig.json' is out of date because oldest output 'pkg9/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:44 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
 [12:08:46 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:08:47 AM] Project 'pkg10/tsconfig.json' is out of date because oldest output 'pkg10/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:48 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 [12:08:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg6/index.ts"]
@@ -3226,45 +3118,30 @@ Output::
 
 [12:08:54 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:08:55 AM] Project 'pkg12/tsconfig.json' is out of date because oldest output 'pkg12/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:56 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
 [12:08:58 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:08:59 AM] Project 'pkg13/tsconfig.json' is out of date because oldest output 'pkg13/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:00 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
 [12:09:02 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:09:03 AM] Project 'pkg14/tsconfig.json' is out of date because oldest output 'pkg14/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:04 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
 [12:09:06 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:09:07 AM] Project 'pkg15/tsconfig.json' is out of date because oldest output 'pkg15/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:08 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 [12:09:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg11/index.ts"]
@@ -3497,45 +3374,30 @@ Output::
 
 [12:09:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: tsconfig.tsbuildinfo
 [12:09:15 AM] Project 'pkg17/tsconfig.json' is out of date because oldest output 'pkg17/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:16 AM] Building project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
 [12:09:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: tsconfig.tsbuildinfo
 [12:09:19 AM] Project 'pkg18/tsconfig.json' is out of date because oldest output 'pkg18/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:20 AM] Building project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
 [12:09:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: tsconfig.tsbuildinfo
 [12:09:23 AM] Project 'pkg19/tsconfig.json' is out of date because oldest output 'pkg19/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:24 AM] Building project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
 [12:09:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: tsconfig.tsbuildinfo
 [12:09:27 AM] Project 'pkg20/tsconfig.json' is out of date because oldest output 'pkg20/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:28 AM] Building project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
 [12:09:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg16/index.ts"]
@@ -3768,18 +3630,12 @@ Output::
 
 [12:09:35 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: tsconfig.tsbuildinfo
 [12:09:36 AM] Project 'pkg22/tsconfig.json' is out of date because oldest output 'pkg22/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:37 AM] Building project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
 [12:09:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: tsconfig.tsbuildinfo
 [12:09:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -4124,8 +3980,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:09:43 AM] File change detected. Starting incremental compilation...
 
@@ -4133,10 +3987,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:09:45 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -4363,45 +4213,30 @@ Output::
 
 [12:10:01 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:10:02 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:03 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:10:05 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:10:06 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:07 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:10:09 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:10:10 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:11 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:10:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:10:14 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:15 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:10:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -4634,45 +4469,30 @@ Output::
 
 [12:10:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:10:22 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:23 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:10:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:10:26 AM] Project 'pkg8/tsconfig.json' is out of date because oldest output 'pkg8/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:27 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
 [12:10:29 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:10:30 AM] Project 'pkg9/tsconfig.json' is out of date because oldest output 'pkg9/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:31 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
 [12:10:33 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:10:34 AM] Project 'pkg10/tsconfig.json' is out of date because oldest output 'pkg10/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:35 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 [12:10:37 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg6/index.ts"]
@@ -4902,8 +4722,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:10:40 AM] File change detected. Starting incremental compilation...
 
@@ -4911,80 +4729,46 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:10:42 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:10:55 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:10:57 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:10:58 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:00 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:11:01 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:03 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:11:04 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:06 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:11:07 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:09 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 [12:11:10 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:12 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:11:13 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:15 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:11:16 AM] Project 'pkg8/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:18 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:11:19 AM] Project 'pkg9/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:21 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:11:22 AM] Project 'pkg10/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:24 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -5237,45 +5021,30 @@ Output::
 
 [12:11:28 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:11:29 AM] Project 'pkg12/tsconfig.json' is out of date because oldest output 'pkg12/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:30 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
 [12:11:32 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:11:33 AM] Project 'pkg13/tsconfig.json' is out of date because oldest output 'pkg13/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:34 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
 [12:11:36 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:11:37 AM] Project 'pkg14/tsconfig.json' is out of date because oldest output 'pkg14/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:38 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
 [12:11:40 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:11:41 AM] Project 'pkg15/tsconfig.json' is out of date because oldest output 'pkg15/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:42 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 [12:11:44 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg11/index.ts"]
@@ -5505,8 +5274,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:11:48 AM] File change detected. Starting incremental compilation...
 
@@ -5514,10 +5281,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:11:50 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -5747,45 +5510,30 @@ Output::
 
 [12:12:06 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:12:07 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:08 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:12:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:12:11 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:12 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:12:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:12:15 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:16 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:12:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:12:19 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:20 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:12:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -6018,45 +5766,30 @@ Output::
 
 [12:12:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:12:27 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:28 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:12:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:12:31 AM] Project 'pkg8/tsconfig.json' is out of date because oldest output 'pkg8/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:32 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
 [12:12:34 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:12:35 AM] Project 'pkg9/tsconfig.json' is out of date because oldest output 'pkg9/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:36 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
 [12:12:38 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:12:39 AM] Project 'pkg10/tsconfig.json' is out of date because oldest output 'pkg10/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:40 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 [12:12:42 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg6/index.ts"]
@@ -6289,45 +6022,30 @@ Output::
 
 [12:12:46 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:12:47 AM] Project 'pkg12/tsconfig.json' is out of date because oldest output 'pkg12/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:48 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
 [12:12:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:12:51 AM] Project 'pkg13/tsconfig.json' is out of date because oldest output 'pkg13/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:52 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
 [12:12:54 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:12:55 AM] Project 'pkg14/tsconfig.json' is out of date because oldest output 'pkg14/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:56 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
 [12:12:58 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:12:59 AM] Project 'pkg15/tsconfig.json' is out of date because oldest output 'pkg15/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:00 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 [12:13:02 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg11/index.ts"]
@@ -6560,45 +6278,30 @@ Output::
 
 [12:13:06 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: tsconfig.tsbuildinfo
 [12:13:07 AM] Project 'pkg17/tsconfig.json' is out of date because oldest output 'pkg17/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:08 AM] Building project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
 [12:13:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: tsconfig.tsbuildinfo
 [12:13:11 AM] Project 'pkg18/tsconfig.json' is out of date because oldest output 'pkg18/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:12 AM] Building project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
 [12:13:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: tsconfig.tsbuildinfo
 [12:13:15 AM] Project 'pkg19/tsconfig.json' is out of date because oldest output 'pkg19/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:16 AM] Building project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
 [12:13:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: tsconfig.tsbuildinfo
 [12:13:19 AM] Project 'pkg20/tsconfig.json' is out of date because oldest output 'pkg20/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:20 AM] Building project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
 [12:13:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg16/index.ts"]
@@ -6831,18 +6534,12 @@ Output::
 
 [12:13:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: tsconfig.tsbuildinfo
 [12:13:27 AM] Project 'pkg22/tsconfig.json' is out of date because oldest output 'pkg22/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:28 AM] Building project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
 [12:13:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: tsconfig.tsbuildinfo
 [12:13:31 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
index ae086cd85a384..9d39f6ac125d3 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
@@ -281,8 +281,6 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
 
@@ -290,24 +288,14 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:01:14 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:27 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:01:29 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:01:30 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:01:32 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:01:33 AM] Found 0 errors. Watching for file changes.
 
 
@@ -447,8 +435,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
@@ -456,10 +442,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:01:38 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -564,18 +546,12 @@ Output::
 
 [12:01:54 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:01:55 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:01:56 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:58 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:01:59 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
index 6930e6d52487c..38b7bfc6373ef 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
@@ -437,8 +437,6 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
@@ -446,38 +444,22 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:01:46 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:59 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:02:02 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:02:05 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:07 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:02:08 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:10 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:02:11 AM] Found 0 errors. Watching for file changes.
 
 
@@ -647,8 +629,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:02:14 AM] File change detected. Starting incremental compilation...
 
@@ -656,10 +636,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:02:16 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -776,36 +752,24 @@ Output::
 
 [12:02:32 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:02:33 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:02:34 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:02:36 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:02:37 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:02:38 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:02:40 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:02:41 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:02:42 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:02:44 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:02:45 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
index 367c9b6f5961d..51f3aaa618d33 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
@@ -671,8 +671,6 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:02:32 AM] File change detected. Starting incremental compilation...
 
@@ -680,59 +678,34 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:02:34 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:47 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:49 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:02:50 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:02:53 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:55 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:02:56 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:58 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:02:59 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:03:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 [12:03:02 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:03:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:03:05 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:03:07 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:03:08 AM] Found 0 errors. Watching for file changes.
 
 
@@ -947,8 +920,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:03:11 AM] File change detected. Starting incremental compilation...
 
@@ -956,10 +927,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:03:13 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -1094,45 +1061,30 @@ Output::
 
 [12:03:29 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:03:30 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:31 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:03:33 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:03:34 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:35 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:03:37 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:03:38 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:39 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:03:41 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:03:42 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:43 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:03:45 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -1275,18 +1227,12 @@ Output::
 
 [12:03:49 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:03:50 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:51 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:03:53 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:03:54 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1451,8 +1397,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:03:57 AM] File change detected. Starting incremental compilation...
 
@@ -1460,10 +1404,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:03:59 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -1600,45 +1540,30 @@ Output::
 
 [12:04:16 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:04:17 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:18 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:04:20 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:04:21 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:22 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:04:24 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:04:25 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:26 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:04:28 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:04:29 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:30 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:04:32 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -1778,8 +1703,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:04:35 AM] File change detected. Starting incremental compilation...
 
@@ -1787,45 +1710,26 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:04:37 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:04:50 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:04:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:04:53 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:04:55 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:04:56 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:04:58 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:04:59 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:05:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:05:02 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:05:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -1973,18 +1877,12 @@ Output::
 
 [12:05:08 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:05:09 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:05:10 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:05:12 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:05:13 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
index 96e1a7837424a..3458c8a45830f 100644
--- a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
+++ b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
@@ -256,8 +256,6 @@ export function f2() { } // trailing
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: index.ts
-
 >> Screen clear
 [12:00:55 AM] File change detected. Starting incremental compilation...
 
@@ -265,19 +263,12 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared
 
 [12:00:57 AM] Building project '/user/username/projects/myproject/shared/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:10 AM] Project 'webpack/tsconfig.json' is out of date because oldest output 'webpack/index.js' is older than newest input 'shared/tsconfig.json'
 
 [12:01:11 AM] Building project '/user/username/projects/myproject/webpack/tsconfig.json'...
 
 [12:01:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/webpack/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/webpack 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/webpack 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/webpack 1 change:: tsconfig.tsbuildinfo
 [12:01:14 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
index 811a42de30c2e..ae54838ae4d6b 100644
--- a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
+++ b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
@@ -264,8 +264,6 @@ export interface Session {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/reexport/src/pure 1 change:: session.ts
-
 >> Screen clear
 [12:01:07 AM] File change detected. Starting incremental compilation...
 
@@ -431,8 +429,6 @@ export interface Session {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/reexport/src/pure 1 change:: session.ts
-
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
index db2348e0bb6b5..9aebd0d53e615 100644
--- a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
+++ b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
@@ -229,28 +229,24 @@ Output::
 
 [12:01:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:14 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:15 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:18 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:19 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:22 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:23 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:01:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -415,21 +411,18 @@ Output::
 
 [12:01:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:40 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:41 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:44 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:45 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
index 11ea03a188998..ad4d9d4891d81 100644
--- a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
@@ -232,28 +232,24 @@ Output::
 
 [12:01:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:14 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:15 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:18 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:19 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:22 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:23 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:01:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -423,21 +419,18 @@ Output::
 
 [12:01:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:40 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:41 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:44 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:45 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
index 13eaa8fcc6a5b..b2c561112eb81 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
@@ -71,10 +71,8 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: f.ts
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry::  1 change:: f.js
 [12:00:23 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
index 37dbaf9360641..b096bac970057 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
@@ -70,10 +70,8 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: f.ts
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry::  1 change:: f.js
 [12:00:23 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
index 32537ebf8b9f1..102a3122368ca 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
@@ -75,15 +75,9 @@ var b = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 rename:: file.ts
-sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 rename:: file.ts
-sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 change:: 
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 change:: file.js
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
index 10c8410f08eef..9567f0deb6e50 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
@@ -109,14 +109,9 @@ export function Foo() { return 10; }export function foo2() { return 2; }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.ts
-
 >> Screen clear
 [12:00:29 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f3.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
@@ -183,13 +178,9 @@ export function Foo() { return 10; }export function foo2() { return 2; }export f
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f2.js
 [12:00:49 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
index 49c83ee1c7b6a..18c5c07ceb7cc 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
@@ -139,12 +139,9 @@ export var T: number;export function Foo() { };
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
 a/b/globalFile3.ts:1:1 - error TS1208: 'globalFile3.ts' cannot be compiled under '--isolatedModules' because it is considered a global script file. Add an import, export, or an empty 'export {}' statement to make it a module.
 
 1 interface GlobalFoo { age: number }
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
index 6c16f70ec573f..04f23c2aaa5a2 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
@@ -138,12 +138,9 @@ export var T: number;export function Foo() { };
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: out.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
index c34cc2418dea2..b5c71000f714a 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
@@ -135,15 +135,9 @@ export var T: number;export function Foo() { };
 //// [/a/b/file1Consumer2.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: file1Consumer2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
index fdf42df7712dc..f4707855b3345 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
@@ -137,18 +137,9 @@ import {Foo} from "./moduleFile1"; let y = Foo();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: file1Consumer3.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: file1Consumer3.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:00:52 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
index 351f027b7190b..c11c863a1663d 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
@@ -134,12 +134,9 @@ export let y = Foo();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 a/b/file1Consumer1.ts:1:16 - error TS2304: Cannot find name 'Foo'.
 
 1 export let y = Foo();
@@ -208,13 +205,9 @@ export var T: number;export function Foo() { };
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
 a/b/file1Consumer1.ts:1:16 - error TS2304: Cannot find name 'Foo'.
 
 1 export let y = Foo();
@@ -288,12 +281,9 @@ import {Foo} from "./moduleFile1";let y = Foo();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
-
 >> Screen clear
 [12:00:57 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
@@ -357,14 +347,9 @@ export let y = Foo();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 a/b/file1Consumer1.ts:1:9 - error TS2305: Module '"./moduleFile1"' has no exported member 'Foo'.
 
 1 import {Foo} from "./moduleFile1";let y = Foo();
@@ -450,15 +435,9 @@ export var T: number;export function Foo() { };
 //// [/a/b/file1Consumer1.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:01:23 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:01:33 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
index 66782a2e0b566..5e4bee56e5d58 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
@@ -134,14 +134,9 @@ export var T: number;export function Foo() { };
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -213,12 +208,9 @@ export var T: number;export function Foo() { console.log('hi'); };
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
 a/b/moduleFile1.ts:1:46 - error TS2584: Cannot find name 'console'. Do you need to change your target library? Try changing the 'lib' compiler option to include 'dom'.
 
 1 export var T: number;export function Foo() { console.log('hi'); };
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
index 632852185fa0e..cdbce1ebf488b 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
@@ -92,12 +92,9 @@ export var x = Foo();export var yy = Foo();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.ts
-
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.js
 a/b/referenceFile1.ts:1:22 - error TS6053: File '/a/b/moduleFile2.ts' not found.
 
 1 /// <reference path="./moduleFile2.ts" />
@@ -168,15 +165,9 @@ export var Foo4 = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.js
 a/b/referenceFile1.ts:2:16 - error TS2304: Cannot find name 'Foo'.
 
 2 export var x = Foo();export var yy = Foo();
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
index bc031dbd2623a..9f19ac324e202 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
@@ -99,13 +99,9 @@ Input::
 //// [/a/b/moduleFile1.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.js
 a/b/referenceFile1.ts:1:22 - error TS6053: File '/a/b/moduleFile1.ts' not found.
 
 1 /// <reference path="./moduleFile1.ts" />
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
index db1b85eef2955..dcabd0690ecbc 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
@@ -134,16 +134,9 @@ interface GlobalFoo { age: number }var T2: string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: globalFile3.ts
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: globalFile3.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile2.js
 [12:00:53 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
index b3e5011bb110f..46553cf38b57d 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
@@ -147,13 +147,9 @@ import {Foo} from "./moduleFile1"; export var y = 10;export var T: number;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1Consumer1.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -223,14 +219,9 @@ export var T: number;export function Foo() { };
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:01:02 AM] Found 0 errors. Watching for file changes.
 
 
@@ -308,16 +299,9 @@ import {Foo} from "./moduleFile1"; export var y = 10;export var T: number;export
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1Consumer1.js
 [12:01:21 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
index 2737c00d55108..7cd30bac07b7c 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
@@ -97,13 +97,9 @@ export var t1 = 10;export var t3 = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.ts
-
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file2.js
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
index 3bf69033301de..17fec0923ba94 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
@@ -86,13 +86,9 @@ let x = 11
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
-
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b.js
 [12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
@@ -148,13 +144,9 @@ let xy = 11
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b.js
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
index a3b210b6c55a7..422ae9350d56d 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
@@ -77,12 +77,9 @@ let x = 11
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
-
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -133,12 +130,9 @@ let xy = 11
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
index 57728b97c5077..dec712bb5bd5b 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
@@ -77,12 +77,9 @@ let x = 11
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
-
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -133,12 +130,9 @@ let xy = 11
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
index aa692ee55e945..59d6f8709809e 100644
--- a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
+++ b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
@@ -86,8 +86,6 @@ var zz30 = 100;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/rootfolder/project/scripts 1 rename:: TypeScript.ts
-
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
index 4272cbcea36af..588dd0314619b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
@@ -111,9 +109,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
@@ -174,9 +169,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
@@ -237,9 +229,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
index 18518fb78ed74..3c4a303ac4d75 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
@@ -134,14 +134,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -219,13 +214,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -300,13 +291,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 7c1d44cfc35a1..f6870d4839f63 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,16 +184,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
 [12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
@@ -270,13 +263,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:04 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:11 AM] Found 0 errors. Watching for file changes.
 
 
@@ -344,13 +333,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:22 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index 4e3a6ee79324b..1bf3370f68001 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,27 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -381,12 +363,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -394,7 +373,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -517,8 +495,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -576,16 +552,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -696,8 +667,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index 53d8f55173640..8f309c9a27f38 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -97,8 +97,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -158,25 +156,9 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
@@ -247,8 +229,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
@@ -305,8 +285,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -364,12 +342,9 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
@@ -424,8 +399,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 9133600506473..79e6631c3f518 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,10 +40,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -117,9 +113,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
@@ -180,9 +173,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
@@ -243,9 +233,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
index 66f8cda0d13a7..373706d52b51b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,15 +151,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:00:55 AM] Found 0 errors. Watching for file changes.
 
 
@@ -236,15 +230,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:59 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
@@ -321,15 +309,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 212fde67d6fcf..a56820f7ba866 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,15 +214,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -318,15 +312,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:11 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -422,15 +410,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index 1ed125b0faf66..7a3452236305e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -174,8 +174,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -235,33 +233,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -403,12 +379,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -416,7 +389,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -540,8 +512,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -599,17 +569,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -722,8 +686,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index acd31dd9f41a7..a660578a35d28 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -97,8 +97,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -158,31 +156,9 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
@@ -267,8 +243,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -325,8 +299,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
@@ -384,13 +356,9 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -446,8 +414,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
index a823ee84d13ec..631343058a2df 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
@@ -111,9 +109,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
@@ -181,9 +176,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
@@ -246,9 +238,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
index 80b3e7ab6f5b6..ef905fec9f71d 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
@@ -134,14 +134,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -219,13 +214,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:00:57 AM] Found 0 errors. Watching for file changes.
 
 
@@ -297,13 +288,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 7908db053821c..ab0c14cc99bcc 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,16 +184,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
 [12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
@@ -270,13 +263,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:04 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -364,13 +353,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:22 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
index b0a79435ec614..388c3ea98bdb6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
@@ -178,8 +178,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -239,27 +237,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -385,12 +367,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -398,7 +377,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -520,8 +498,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -579,16 +555,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -698,8 +669,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
index f600fe003dd92..5b49bc9b5c4fd 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
@@ -103,8 +103,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -164,25 +162,9 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
@@ -253,8 +235,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
@@ -311,8 +291,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -370,12 +348,9 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
@@ -430,8 +405,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
index 1c951a2e9282a..699571df19343 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,10 +40,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -117,14 +113,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -190,14 +181,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
@@ -258,14 +244,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
index 4193ca00dcef2..1c4a21d2285bb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,16 +151,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -245,16 +238,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:18 AM] Found 0 errors. Watching for file changes.
 
 
@@ -334,16 +320,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:22 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 076f55957da12..c21f835e5b510 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,17 +214,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:13 AM] Found 0 errors. Watching for file changes.
 
 
@@ -310,17 +302,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -422,17 +406,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:59 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
index a9e15a098daa1..03fa4e8f54925 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,33 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -401,12 +377,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -414,7 +387,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -537,8 +509,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -596,17 +566,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -718,8 +682,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
index 502b157b6c520..b3308300226e6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
@@ -97,8 +97,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -158,31 +156,9 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
@@ -267,8 +243,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -325,8 +299,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
@@ -384,13 +356,9 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -446,8 +414,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
index d5a6c8568da35..66f60506f1f5a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,14 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -184,18 +178,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -320,18 +307,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -456,18 +436,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:02 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
index a3606cfd1fe1c..1dd6ac58db846 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
@@ -203,15 +203,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -219,7 +213,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:53 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -368,14 +361,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -383,7 +371,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:10 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -529,14 +516,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -544,7 +526,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:27 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 9c299deb465c9..1bcca5eaac7e8 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -328,20 +328,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:07 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -512,17 +503,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:24 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -684,17 +669,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:41 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index 49931f851f2e9..ed442af297e49 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,27 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -381,12 +363,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -394,7 +373,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -517,8 +495,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -576,16 +552,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -696,8 +667,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index 05db41a17298a..6d1212b6674c5 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,27 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -381,12 +363,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -394,7 +373,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -517,8 +495,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -576,16 +552,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -696,8 +667,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 9a9a3900fb9de..df8601c2f13a0 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,16 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -188,18 +180,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -322,18 +307,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:53 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -456,18 +434,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
index 8ffe146b50c9c..3416312008eda 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -218,19 +218,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:02 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -372,19 +364,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:25 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -526,19 +510,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 8dc8c3f723eef..ba092a2792a08 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -356,16 +356,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -384,7 +377,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:14 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -604,16 +596,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -632,7 +617,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:37 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -852,16 +836,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -880,7 +857,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:02:00 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index 04450f6526029..6e2a98a4df712 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -174,8 +174,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -235,33 +233,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -403,12 +379,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -416,7 +389,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -540,8 +512,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -599,17 +569,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -722,8 +686,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index c06900663a077..6ce359f78c7bf 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -174,8 +174,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -235,33 +233,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -403,12 +379,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -416,7 +389,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -540,8 +512,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -599,17 +569,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -722,8 +686,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
index a9adc01739724..4b76ba3f74523 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,14 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -181,14 +175,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -196,8 +185,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:40 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -333,18 +320,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -468,14 +448,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -483,8 +458,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:02 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
index 14141643f1bbb..6b6265e4062da 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
@@ -200,15 +200,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -216,7 +210,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:53 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -362,17 +355,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:10 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -508,14 +495,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -523,7 +505,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:27 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 6b17086fc49d7..0bd997cf7d85b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -325,20 +325,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:07 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -506,14 +497,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -532,7 +518,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:24 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -743,17 +728,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:41 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
index a8a79d5331b90..194267bbfe50b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
@@ -178,8 +178,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -239,27 +237,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -385,12 +367,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -398,7 +377,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -520,8 +498,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -579,16 +555,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -698,8 +669,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
index 5d757c9ff666b..ce00016b8efec 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
@@ -178,8 +178,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -239,27 +237,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -385,12 +367,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -398,7 +377,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -520,8 +498,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -579,16 +555,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -698,8 +669,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
index 02a69a4b949ce..a8dc692ec8683 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,16 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -187,16 +179,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -204,8 +189,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:45 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -342,20 +325,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -480,16 +454,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -497,8 +464,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:13 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
index 404c159553e53..da962daca7abb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
@@ -217,17 +217,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -235,7 +227,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:05 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -391,20 +382,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:31 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -548,17 +530,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -566,7 +540,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:57 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index edfc5817c9add..932f6e6d7b252 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -355,21 +355,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -549,18 +539,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -579,7 +560,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:49 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -804,21 +784,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:02:18 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
index 9b8c6f9dae650..d0a4d0f318392 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,33 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -401,12 +377,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -414,7 +387,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -537,8 +509,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -596,17 +566,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -718,8 +682,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
index 45751dc922034..d8a4f56d04260 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,33 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -401,12 +377,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -414,7 +387,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -537,8 +509,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -596,17 +566,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -718,8 +682,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
index 415be8cbf8d7c..2fcab61a09b4e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,14 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -181,14 +175,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -196,8 +185,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:40 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -333,18 +320,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -468,14 +448,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -483,8 +458,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:02 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
index 84163b27c9ad1..26cd3ba63c1ae 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
@@ -200,13 +200,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -214,7 +210,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:47 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -361,16 +356,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -505,13 +495,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -519,7 +505,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:15 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 47e8cb014d611..1ce4cd7ddf0e6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -325,16 +325,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:55 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -501,13 +496,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -526,7 +517,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:09 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -738,16 +728,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:23 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
index 5487cd16f8c0b..653445b31864a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -172,8 +172,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -233,27 +231,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -379,12 +361,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -392,7 +371,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -514,8 +492,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -573,16 +549,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -692,8 +663,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
index bdc2748c42373..989ae3dbbb1ca 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
@@ -172,8 +172,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -233,27 +231,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -379,12 +361,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -392,7 +371,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -514,8 +492,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -573,16 +549,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -692,8 +663,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 787aa270209c2..acd5004cc0b66 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,16 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -187,16 +179,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -204,8 +189,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:45 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -342,20 +325,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -480,16 +454,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -497,8 +464,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:13 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
index fbde7ff089812..b15e1527acddc 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -217,16 +217,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -234,7 +227,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:02 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -389,19 +381,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:25 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -544,16 +528,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -561,7 +538,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:48 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 19a3b54610edd..b635367da4bad 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -355,21 +355,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -551,18 +541,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -581,7 +562,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:49 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -808,21 +788,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:02:18 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index adffac996df20..8a2fffaedd3e0 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,33 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -401,12 +377,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -414,7 +387,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -537,8 +509,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -596,17 +566,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -718,8 +682,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
index 39499bedd8dd7..bed1bc6d9d617 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,33 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -401,12 +377,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -414,7 +387,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -537,8 +509,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -596,17 +566,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -718,8 +682,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
index 4c9137b412ea7..e10259bdb7999 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
@@ -111,9 +109,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
@@ -181,9 +176,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
@@ -246,9 +238,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
index b13d120ad6507..77efd91c3c423 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
@@ -134,12 +134,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -215,12 +212,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -291,12 +285,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 23ec4494fa2f3..40a113914a8b5 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,12 +184,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -262,12 +259,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -356,12 +350,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
index effe08a727e64..2c894c145b09a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -172,8 +172,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -233,27 +231,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -379,12 +361,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -392,7 +371,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -514,8 +492,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -573,16 +549,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -692,8 +663,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
index 00d9bfbcc6f31..a0bbf83e0dc85 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
@@ -97,8 +97,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -158,25 +156,9 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
@@ -247,8 +229,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
@@ -305,8 +285,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -364,12 +342,9 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
@@ -424,8 +399,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
index fd82ee72294b1..618fe53144a13 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,10 +40,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -117,14 +113,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -190,14 +181,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
@@ -258,14 +244,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
index f802f56f1c48b..dd21b663f9d48 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,15 +151,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -243,15 +237,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:59 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
@@ -330,15 +318,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 9514448be65e7..08665de0850ed 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,17 +214,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:01:13 AM] Found 0 errors. Watching for file changes.
 
 
@@ -312,17 +304,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -426,17 +410,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:01:59 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index 53e409de7fde5..9e681e6599665 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,33 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -401,12 +377,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -414,7 +387,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -537,8 +509,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -596,17 +566,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -718,8 +682,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
index 66b5a94ca600a..34f7d03b64896 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
@@ -97,8 +97,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -158,31 +156,9 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
@@ -267,8 +243,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -325,8 +299,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
@@ -384,13 +356,9 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -446,8 +414,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
index fd59c5990215f..dec29649773ce 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
@@ -115,13 +115,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.ts
-
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: b.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 project/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
index 0b28da762ec06..4503d40a300d3 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
@@ -115,13 +115,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.ts
-
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: b.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 project/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
index 8fcebef95b7ab..d2f27653bed2a 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
@@ -143,12 +143,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
index 1cb178832b5ef..9670b01db257f 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
@@ -131,13 +131,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
index 77774ae652950..9d715495c3c4a 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
@@ -97,12 +97,9 @@ import { logger } from "./Logger"; new logger();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: another.ts
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: another.js
 user/username/projects/myproject/another.ts:1:24 - error TS1261: Already included file name '/user/username/projects/myproject/Logger.ts' differs from file name '/user/username/projects/myproject/logger.ts' only in casing.
   The file is in the program because:
     Imported via "./Logger" from file '/user/username/projects/myproject/another.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
index cc3f543daafd8..b34869681bb6c 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
@@ -143,12 +143,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
index d652c222335c8..61a08b485eff8 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
@@ -131,13 +131,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
index a03d7beee386a..e54490bf6694b 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
@@ -149,12 +149,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 b.ts:2:19 - error TS2792: Cannot find module './yX/a'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 2 import { a } from "./yX/a";
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
index 4e8d9102a6b0d..c42e49cc01c79 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
@@ -36,12 +36,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: XY.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: link.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 b.ts:2:19 - error TS2307: Cannot find module './yX' or its corresponding type declarations.
 
 2 import { a } from "./yX";
@@ -145,14 +139,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
 b.ts:2:19 - error TS2307: Cannot find module './yX' or its corresponding type declarations.
 
 2 import { a } from "./yX";
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
index a7a3d48e40fc2..23a93128bab68 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
@@ -151,12 +151,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
   The file is in the program because:
     Imported via "./Xy/a" from file '/user/username/projects/myproject/b.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
index cc6ae7be49c20..dd0ca380d9f3e 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
@@ -139,13 +139,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 b.ts:2:19 - error TS1149: File name '/user/username/projects/myproject/Xy.ts' differs from already included file name '/user/username/projects/myproject/XY.ts' only in casing.
   The file is in the program because:
     Matched by default include pattern '**/*'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
index d4c7b75e3583c..b80e2134bce4b 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
@@ -151,12 +151,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
   The file is in the program because:
     Imported via "./Xy/a" from file '/user/username/projects/myproject/b.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
index 0c6cbe0e17602..c97de6ce4280b 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
@@ -139,13 +139,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 b.ts:2:19 - error TS1149: File name '/user/username/projects/myproject/Xy.ts' differs from already included file name '/user/username/projects/myproject/XY.ts' only in casing.
   The file is in the program because:
     Matched by default include pattern '**/*'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
index e696b1e3b441b..8478461feaac8 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
@@ -142,12 +142,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: moduleA.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: moduleA.js
 moduleA.ts:2:40 - error TS1261: Already included file name '/user/username/projects/myproject/ModuleC.ts' differs from file name '/user/username/projects/myproject/moduleC.ts' only in casing.
   The file is in the program because:
     Imported via "./ModuleC" from file '/user/username/projects/myproject/moduleA.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
index ba1320e8cec68..92a7dcac194b7 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
@@ -95,11 +95,6 @@ Input::
 //// [/user/username/projects/myproject/Logger.ts] file was renamed from file /user/username/projects/myproject/logger.ts
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: logger.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: Logger.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
index 16fd7a70eb79d..f97d3a05fb12e 100644
--- a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
@@ -32,8 +32,6 @@ Output::
 >> Screen clear
 [12:00:33 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /users/username/projects/project/src 1 rename:: index.js
-sysLog:: watchPresentFileSystemEntry:: /users/username/projects/project/src 1 change:: 
 [12:00:38 AM] Found 0 errors. Watching for file changes.
 
 
@@ -178,7 +176,6 @@ Output::
 >> Screen clear
 [12:00:44 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /users/username/projects/project/src 1 change:: index.js
 src/index.ts:1:51 - error TS2339: Property 'foo' does not exist on type 'Result'.
 
 1 import classNames from "classnames"; classNames().foo;
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
index c9009919cbd8d..8ab4f71d85f61 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
@@ -153,8 +153,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
-
 >> Screen clear
 [12:00:53 AM] File change detected. Starting incremental compilation...
 
@@ -182,7 +180,6 @@ File '/user/username/projects/myproject/node_modules/pkg2/build/other.tsx' does
 File '/user/username/projects/myproject/node_modules/pkg2/build/other.d.ts' exist - use it as a name resolution result.
 Resolving real path for '/user/username/projects/myproject/node_modules/pkg2/build/other.d.ts', result '/user/username/projects/myproject/packages/pkg2/build/other.d.ts'.
 ======== Module name 'pkg2' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/other.d.ts' with Package ID 'pkg2/build/other.d.ts@1.0.0'. ========
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 packages/pkg1/index.ts:1:15 - error TS2305: Module '"pkg2"' has no exported member 'TheNum'.
 
 1 import type { TheNum } from 'pkg2'
@@ -288,7 +285,6 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.ts' does not e
 File '/user/username/projects/myproject/packages/pkg2/build/const.tsx' does not exist.
 File '/user/username/projects/myproject/packages/pkg2/build/const.d.ts' exist - use it as a name resolution result.
 ======== Module name './const.js' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/const.d.ts'. ========
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 [12:01:05 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js
index 0c1b4d730ed84..5ec25f7fcfe83 100644
--- a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
+++ b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
@@ -99,8 +99,6 @@ Thing.fn();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /project 1 change:: src/index.ts
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
index 39756910bb7c8..15a3e8bd3fa82 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
@@ -101,8 +101,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
index 269eb38c46f33..65462ae84baab 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
@@ -78,8 +78,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
@@ -133,8 +131,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
index 30b1cb0e0312c..4f47cd5f54f3c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
@@ -72,8 +72,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
@@ -124,8 +122,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:23 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
index 66d242d647884..22d57ffd06393 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
@@ -74,15 +74,9 @@ let y = 1
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 [12:00:27 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
index f5635e360db3c..9be0097c5bedf 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
@@ -21,8 +21,6 @@ Output::
 >> Screen clear
 [12:00:13 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/file1.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
 a/b/file1.ts:1:20 - error TS2307: Cannot find module './moduleFile' or its corresponding type declarations.
 
 1 import * as T from "./moduleFile"; T.bar();
@@ -77,9 +75,6 @@ export function bar() { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/moduleFile.ts
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
-
 >> Screen clear
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
index 3d5c9ba773fd5..4ef78e41a9881 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
@@ -74,15 +74,9 @@ let y = 1
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: f2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: f2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
 [12:00:27 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
index 58860e5eb1776..48b958db8510f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
@@ -79,14 +79,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 rename:: file2.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 change:: 
-
 >> Screen clear
 [12:00:29 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 rename:: file2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
index 1875f9e0907dc..1d1e3a97eda54 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
@@ -76,12 +76,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
 a/b/f1.ts:1:1 - error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
 
 1 export {}
diff --git a/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js b/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
index 9fcee78a9ddbd..8ce89bda343d1 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
@@ -84,8 +84,6 @@ Input::
 //// [/a/b/tsconfig.json] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
 error TS5083: Cannot read file '/a/b/tsconfig.json'.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
index caef1045d34e2..c5b9c128afc0b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
@@ -83,12 +83,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /src 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /src 1 change:: app.js
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
index d6c7a106c6db5..c24a8fc88e321 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
@@ -27,8 +27,6 @@ Output::
 >> Screen clear
 [12:00:17 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/c/app.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/c
 a/b/c/app.ts:2:25 - error TS2305: Module '"./module"' has no exported member 'f'.
 
 2                 import {f} from "./module"
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
index 0a759aac1e818..a10797617e9a4 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
@@ -125,7 +125,6 @@ Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/f1.js
 a/b/f1.ts:1:15 - error TS7016: Could not find a declaration file for module './f2'. '/a/b/f2.js' implicitly has an 'any' type.
 
 1 export * from "./f2"
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
index cdf207a5bbbed..233d8635a3ebe 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
@@ -125,7 +125,6 @@ Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/f1.js
 a/b/f1.ts:1:15 - error TS7016: Could not find a declaration file for module './f2'. '/a/b/f2.js' implicitly has an 'any' type.
 
 1 export * from "./f2"
diff --git a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
index c5357521539e3..1dd28f2ed0021 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
@@ -92,13 +92,9 @@ let y = 1;let xy = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.ts
-
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 a/b/commonFile1.ts
@@ -159,13 +155,9 @@ Input::
 //// [/a/b/commonFile2.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 a/b/commonFile1.ts
@@ -215,14 +207,9 @@ let y = 1
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 a/b/commonFile1.ts
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
index 72aa414b481b3..f44279fbd6495 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
@@ -96,22 +96,9 @@ export function bar() { };
 //// [/a/b/moduleFile.js] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
 a/b/file1.ts:1:20 - error TS2307: Cannot find module './moduleFile' or its corresponding type declarations.
 
 1 import * as T from "./moduleFile"; T.bar();
@@ -181,21 +168,9 @@ export function bar() { };
 //// [/a/b/moduleFile1.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
 [12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
index 31fbce47cdc2e..af64ecde0727f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
@@ -90,7 +90,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/file1.js
 a/b/file1.ts:1:20 - error TS2307: Cannot find module './moduleFile' or its corresponding type declarations.
 
 1 import * as T from "./moduleFile"; T.bar();
@@ -138,11 +137,6 @@ export function bar() { };
 //// [/a/b/moduleFile1.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/moduleFile1.ts
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/moduleFile.ts
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
index 134197ee82e55..4166f16b7541b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
@@ -97,12 +97,9 @@ import { x } from "../b";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: lib/a.js
 a.ts:3:19 - error TS6059: File '/user/username/projects/b.ts' is not under 'rootDir' '/user/username/projects/myproject'. 'rootDir' is expected to contain all source files.
 
 3 import { x } from "../b";
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
index 8a219eb58dac9..ef020d04628d3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
@@ -93,12 +93,9 @@ export const a: number = 1
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 b.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const b: string = a;
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
index ea3e7d8a79e4b..e3fc789404c06 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
@@ -130,8 +130,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
@@ -264,20 +262,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: decls/src/file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: decls/src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
index ffbe73076dae4..620c42fa2a32c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
@@ -262,18 +262,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: build/src/file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: decls/src/file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: decls/src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
index ac766fcc23d15..6800711e1a42f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
@@ -254,16 +254,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: build/src/file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: build/src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
index 9bb0fde4fd3d9..7b96140fceb23 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
@@ -249,15 +249,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: build/outFile.js
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
index f63f2b5bcd268..1b21f2ca83fcc 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
@@ -130,10 +130,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
@@ -266,22 +262,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
index 8aac3f60d10db..1b80ab46e46ad 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
@@ -130,8 +130,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
@@ -256,18 +254,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
index c61858b2e2a6c..f379dda653e4b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
@@ -101,7 +101,6 @@ Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
index 44fe5e4d0d401..d6571f1f2e3e3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
@@ -112,8 +112,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:23 AM] File change detected. Starting incremental compilation...
 
@@ -168,13 +166,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry::  1 change:: b.js
-sysLog:: watchPresentFileSystemEntry::  1 change:: a.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
index 6e93c7990902a..b95366558d2e8 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
@@ -86,12 +86,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:20 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry::  1 change:: a.js
 a.ts:2:21 - error TS2610: 'prop' is defined as an accessor in class 'C', but is overridden here in 'D' as an instance property.
 
 2 class D extends C { prop = 1; }
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
index 847c3c7b569e2..d49eea56c629a 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
@@ -75,13 +75,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
index 0753cecb7b8ac..c29e44a58d755 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
@@ -99,13 +99,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
@@ -156,13 +152,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 b.ts:1:1 - error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
 
 1 import {C} from './a';
@@ -226,13 +218,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
index 715cf188f0664..9412986369c3c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
@@ -85,8 +85,6 @@ export default test;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
@@ -147,8 +145,6 @@ export default test;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
@@ -204,8 +200,6 @@ export default test;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
@@ -271,8 +265,6 @@ export default test;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
index f67d6d31917e5..ce71c8e888fa1 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
@@ -77,15 +77,9 @@ declare module 'a' {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 a.ts:2:8 - error TS2300: Duplicate identifier 'foo'.
 
 2   type foo = number;
@@ -159,13 +153,9 @@ Input::
 //// [/user/username/projects/myproject/b.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
index a26275602e707..2bbd474f5792b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
@@ -93,8 +93,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
index d502751b50f3b..e8849a90830dc 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
@@ -88,8 +88,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
index 81b8bb6b4644e..80b6a9c592175 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
@@ -75,8 +75,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
@@ -129,8 +127,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
@@ -183,8 +179,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
index d37446191d686..410db4b1367bf 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
@@ -27,8 +27,6 @@ Output::
 >> Screen clear
 [12:00:23 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 a.ts:1:23 - error TS2732: Cannot find module './data.json'. Consider using '--resolveJsonModule' to import module with '.json' extension.
 
 1 import * as data from './data.json'
@@ -89,14 +87,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js b/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
index 37336d2bd5d0f..6cf84cd6877f2 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
@@ -75,16 +75,9 @@ var a = 10;
 //// [/home/username/project/src/file1.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 rename:: src/file1.ts
-sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 change:: src
-sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 rename:: src/file2.ts
-sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 change:: src
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 rename:: src/file2.js
-sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 change:: src
 [12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js b/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
index baaba896465c3..2c6d1ff7e912d 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
@@ -84,11 +84,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 Reloading new file names and options
 Synchronizing program
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
index 7ff8a428bca12..27c0214047124 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
@@ -112,11 +112,9 @@ import * as M from "folder1/module1";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 rename:: module3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.ts :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.ts :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 change:: 
 Reloading new file names and options
 Synchronizing program
 [12:00:41 AM] File change detected. Starting incremental compilation...
@@ -125,11 +123,9 @@ CreatingProgramWith::
   roots: ["/user/username/projects/myproject/client/folder1/module1.ts","/user/username/projects/myproject/client/linktofolder2/module2.ts","/user/username/projects/myproject/client/linktofolder2/module3.ts"]
   options: {"baseUrl":"/user/username/projects/myproject/client","paths":{"*":["*"]},"pathsBasePath":"/user/username/projects/myproject","watch":true,"project":"/user/username/projects/myproject","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/client/linktofolder2/module3.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 rename:: module3.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.js :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/folder2/module3.js
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.js :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 change:: 
 [12:00:45 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
index 88a0ed0a9447c..56df7dd17e823 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
@@ -168,11 +168,9 @@ class class3 {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 Reloading new file names and options
 [12:00:45 AM] File change detected. Starting incremental compilation...
@@ -250,11 +248,9 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
@@ -263,12 +259,8 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"watch":true,"project":"/user/username/projects/myproject/projects/project2/tsconfig.json","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -381,16 +373,12 @@ declare class file {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp/file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: temp
 
 
 WatchedFiles::
@@ -433,11 +421,9 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -447,9 +433,6 @@ CreatingProgramWith::
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 error TS6053: File '/user/username/projects/myproject/projects/project1/class3.d.ts' not found.
   The file is in the program because:
     Output from referenced project '/user/username/projects/myproject/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
@@ -461,7 +444,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project
 
 [12:01:18 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -565,11 +547,9 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -578,12 +558,8 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"watch":true,"project":"/user/username/projects/myproject/projects/project2/tsconfig.json","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:01:35 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
index 4ae590d53c6a5..4b564de1611fd 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
@@ -103,8 +103,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
@@ -160,8 +158,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
@@ -222,8 +218,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
@@ -288,8 +282,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
@@ -349,8 +341,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:51 AM] File change detected. Starting incremental compilation...
 
@@ -406,8 +396,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:56 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
index 8116d53563f09..82a4e297d8331 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
@@ -536,13 +536,6 @@ function foo() { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
 
@@ -725,13 +718,6 @@ export declare function gfoo(): void;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-
 >> Screen clear
 [12:01:51 AM] File change detected. Starting incremental compilation...
 
@@ -991,15 +977,6 @@ export declare function gfoo(): void;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: decls
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: decls/index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: decls
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-
 >> Screen clear
 [12:02:22 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
index 7828d8cdf1a5c..f78e22fda1784 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
@@ -346,21 +346,9 @@ export declare function gfoo(): void;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
 
@@ -458,15 +446,9 @@ export class A {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 rename:: nrefs
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: nrefs
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: tsconfig.json
-
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:01:32 AM] Found 0 errors. Watching for file changes.
 
 
@@ -563,12 +545,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: tsconfig.json
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:01:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -665,9 +644,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
@@ -763,9 +739,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:01:50 AM] File change detected. Starting incremental compilation...
 
@@ -848,17 +821,9 @@ Input::
 //// [/user/username/projects/transitiveReferences/b/tsconfig.json] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 c/tsconfig.json:1:84 - error TS6053: File '/user/username/projects/transitiveReferences/b' not found.
 
 1 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"references":[{"path":"../b"}]}
@@ -944,14 +909,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
-
 >> Screen clear
 [12:02:03 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:02:07 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1046,16 +1006,9 @@ Input::
 //// [/user/username/projects/transitiveReferences/a/tsconfig.json] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/a 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/a 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
-
 >> Screen clear
 [12:02:09 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: index.js
 b/tsconfig.json:1:96 - error TS6053: File '/user/username/projects/transitiveReferences/a' not found.
 
 1 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"references":[{"path":"../a"}]}
@@ -1152,10 +1105,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
-
 >> Screen clear
 [12:02:17 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
index 82edc629807b8..1deb26f2868c5 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
@@ -342,12 +342,6 @@ export declare function gfoo(): void;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
@@ -444,10 +438,6 @@ export class A {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 rename:: nrefs
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: nrefs
-
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
@@ -638,8 +628,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
@@ -730,8 +718,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:01:50 AM] File change detected. Starting incremental compilation...
 
@@ -809,14 +795,9 @@ Input::
 //// [/user/username/projects/transitiveReferences/b/tsconfig.json] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
 c/tsconfig.json:1:105 - error TS6053: File '/user/username/projects/transitiveReferences/b' not found.
 
 1 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"files":["index.ts"],"references":[{"path":"../b"}]}
@@ -900,10 +881,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
-
 >> Screen clear
 [12:02:03 AM] File change detected. Starting incremental compilation...
 
@@ -997,14 +974,9 @@ Input::
 //// [/user/username/projects/transitiveReferences/a/tsconfig.json] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
-
 >> Screen clear
 [12:02:09 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: index.js
 b/tsconfig.json:1:117 - error TS6053: File '/user/username/projects/transitiveReferences/a' not found.
 
 1 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"files":["index.ts"],"references":[{"path":"../a"}]}
@@ -1098,10 +1070,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
-
 >> Screen clear
 [12:02:17 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
index 5a8350b7b0b53..ec5ba33068815 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
@@ -24,10 +24,6 @@ Output::
 >> Screen clear
 [12:00:15 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: f1.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: d/f0.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d
 a/d/f0.ts:1:17 - error TS2306: File '/a/f1.ts' is not a module.
 
 1 import {x} from "f1"
@@ -97,12 +93,9 @@ import {x} from "f1"
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.ts
-
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.js
 a/d/f0.ts:1:17 - error TS2306: File '/a/f1.ts' is not a module.
 
 1 import {x} from "f1"
@@ -169,12 +162,9 @@ import {x} from "f2"
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.ts
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.js
 a/d/f0.ts:1:17 - error TS2792: Cannot find module 'f2'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 1 import {x} from "f2"
@@ -231,13 +221,9 @@ import {x} from "f1"
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.ts
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: f1.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.js
 a/d/f0.ts:1:17 - error TS2306: File '/a/f1.ts' is not a module.
 
 1 import {x} from "f1"
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
index 8711b2767ab29..4983e21f361fc 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
@@ -87,19 +87,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: .cache
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/.cache
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: .cache/babel-loader
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/.cache/babel-loader
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: .cache
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/.cache
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: .cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: .cache/babel-loader
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/.cache/babel-loader
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
index 25ea2f7ce25cd..85f14d17a90e3 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
@@ -27,8 +27,6 @@ Output::
 >> Screen clear
 [12:00:27 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/test.js
-sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -83,13 +81,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/node_modules/.cache
-sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject/node_modules
-sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/node_modules/.cache/babel-loader
-sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject/node_modules/.cache
-sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts
-sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject/node_modules/.cache/babel-loader
-
 
 WatchedFiles::
 /user/username/projects/myproject/test.ts:
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
index 26781409f1eb0..fe2afcf3739ba 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
@@ -21,9 +21,6 @@ Output::
 >> Screen clear
 [12:00:11 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: foo.js
-sysLog:: watchPresentFileSystemEntry::  1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
 a/foo.ts:1:17 - error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 1 import {x} from "bar"
@@ -85,15 +82,9 @@ export const y = 1;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.ts
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: bar.d.ts
-sysLog:: watchPresentFileSystemEntry::  1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
-
 >> Screen clear
 [12:00:20 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.js
 [12:00:24 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
index c76354103ea07..a7a69e9bbf8fb 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
@@ -24,8 +24,6 @@ Output::
 >> Screen clear
 [12:00:13 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: foo.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
 [12:00:16 AM] Found 0 errors. Watching for file changes.
 
 
@@ -78,13 +76,9 @@ Input::
 //// [/a/bar.d.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: bar.d.ts
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
-
 >> Screen clear
 [12:00:18 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.js
 a/foo.ts:1:17 - error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 1 import {x} from "bar"
@@ -135,14 +129,9 @@ export const y = 1;export const x = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: bar.d.ts
-sysLog:: watchPresentFileSystemEntry::  1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
-
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.js
 [12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
index e967c45ba9ff9..e1320878fe8ab 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
@@ -87,37 +87,11 @@ declare namespace myapp {
 
 
 Output::
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/node_modules 1 /user/username/projects/myproject/node_modules:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types/package.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types/package.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp/ts-types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp/ts-types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp/ts-types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp/ts-types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types/types/somefile.define.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types/types/somefile.define.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp/ts-types/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp/ts-types/types
 
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: lib/app.js
 [12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
index 5692c7f704e20..4f41981f7b4e6 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
@@ -138,124 +138,83 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/base.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/base.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/globals.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/globals.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/globals.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/index.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/index.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/ts3.6/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/ts3.6/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/ts3.6/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node/ts3.6
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node/ts3.6
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node/ts3.6
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/node_modules/@types/node/ts3.6
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: 
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
 Reloading new file names and options
 Synchronizing program
 [12:00:48 AM] File change detected. Starting incremental compilation...
@@ -268,7 +227,6 @@ FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/base.d.ts 250 undefined Source file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/index.d.ts 250 undefined Source file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/package.json 2000 undefined package.json file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: worker.js
 worker.ts:1:1 - error TS2580: Cannot find name 'process'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`.
 
 1 process.on("uncaughtException");
@@ -322,53 +280,36 @@ export const foo = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: 
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: mocha
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/mocha
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/mocha
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: mocha/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/mocha/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/mocha/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: mocha
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/mocha
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/mocha
 Reloading new file names and options
 Synchronizing program
 [12:00:59 AM] File change detected. Starting incremental compilation...
@@ -431,22 +372,16 @@ Change:: npm ci step three: create atTypes node folder
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types
 Reloading new file names and options
 Synchronizing program
 [12:01:03 AM] File change detected. Starting incremental compilation...
@@ -527,36 +462,24 @@ declare namespace NodeJS {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/node_modules/@types/node/ts3.6
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 Scheduling update
 Reloading new file names and options
 Synchronizing program
@@ -570,7 +493,6 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 250 undefined Source file
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 250 undefined Source file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/node/package.json 2000 undefined package.json file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: worker.js
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
index 66f5bb5c292a2..8dea1d815e32b 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
@@ -87,28 +87,8 @@ declare module "fs" {
 
 
 Output::
-sysLog:: watchMissingFileSystemEntry:: /a/b/node_modules 1 /a/b/node_modules:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /a/b/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: 
-sysLog:: watchMissingFileSystemEntry:: /a/b/node_modules/@types 1 /a/b/node_modules/@types:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /a/b/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: node
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: @types
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: node/package.json
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types/node/package.json
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: node/index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types/node/index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: @types/node
 
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
index 4d3c1fce6dee6..682abdee15795 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
@@ -79,19 +79,8 @@ export {}
 //// [/user/username/projects/myproject/node_modules2/@types/qqq/index.d.ts] deleted
 
 Output::
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/node_modules 1 /user/username/projects/myproject/node_modules:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 /user/username/projects/myproject/node_modules/@types:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /user/username/projects/myproject/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: qqq
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/qqq
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: qqq/index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/qqq/index.d.ts
 
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
index 89d98c62aeb81..57076cf6e3a80 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
@@ -112,8 +112,6 @@ module1("hello");
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b/projects/myproject/src 1 change:: file1.ts
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js b/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
index 725e197cdc986..059b90a59d1d9 100644
--- a/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
+++ b/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
@@ -85,14 +85,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: other2.vue
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-
 >> Screen clear
 [12:00:31 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: other2.vue.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
index 83286fc8537e3..7f5292f597fa5 100644
--- a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
+++ b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
@@ -79,8 +79,6 @@ export const x = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: main.ts
-
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
index 765829369f0c3..96a7d413c8cba 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
@@ -168,11 +168,9 @@ class class3 {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 Loading config file: /user/username/projects/myproject/projects/project1/tsconfig.json
 [12:00:45 AM] File change detected. Starting incremental compilation...
@@ -250,11 +248,9 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
@@ -263,12 +259,8 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -381,16 +373,12 @@ declare class file {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp/file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: temp
 
 
 WatchedFiles::
@@ -433,11 +421,9 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -447,9 +433,6 @@ CreatingProgramWith::
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 error TS6053: File '/user/username/projects/myproject/projects/project1/class3.d.ts' not found.
   The file is in the program because:
     Output from referenced project '/user/username/projects/myproject/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
@@ -461,7 +444,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project
 
 [12:01:18 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -565,11 +547,9 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -578,12 +558,8 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:01:35 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
index 7b25ba1e0ca65..83f887411c96f 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
@@ -168,11 +168,9 @@ class class3 {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 Loading config file: /user/username/projects/myproject/projects/project1/tsconfig.json
 [12:00:45 AM] File change detected. Starting incremental compilation...
@@ -182,12 +180,8 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:00:55 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -300,16 +294,12 @@ declare class file {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp/file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: temp
 
 
 WatchedFiles::
@@ -351,11 +341,9 @@ declare class class3 {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 
 
 WatchedFiles::
diff --git a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
index 995a6339443b7..4c5a5c4a2a475 100644
--- a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
+++ b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
@@ -74,11 +74,6 @@ const y =10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: bar.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: bar.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
index 6713120866d4b..c4141fa5d0453 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -98,7 +98,6 @@ export declare function foo2(): string;
 
 
 Output::
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename::  true foo.ts /foo.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
@@ -168,18 +167,14 @@ export declare function foo(): string;
 
 
 Output::
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename::  true foo.ts /foo.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.ts:: Changing watcher to MissingFileSystemEntryWatcher
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 /user/username/projects/myproject/foo.ts:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename::  true foo.ts /foo.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
index 70cfa01d2725e..534e0e7161485 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
@@ -39,10 +39,8 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 {"watchFile":4} Source file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: main.js true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -101,39 +99,30 @@ export function foo2(): string;
 
 
 Output::
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 /user/username/projects/myproject/foo.d.ts:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 Synchronizing program
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js true myproject /myproject
 main.ts:1:10 - error TS2724: '"./foo"' has no exported member named 'foo'. Did you mean 'foo2'?
 
 1 import { foo } from "./foo"; foo();
@@ -194,39 +183,30 @@ export function foo(): string;
 
 
 Output::
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 /user/username/projects/myproject/foo.d.ts:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 Synchronizing program
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js true myproject /myproject
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
index 56bf549b473a1..129e3ec2f790a 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -98,7 +98,6 @@ export declare function foo2(): string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename:: 
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
@@ -167,11 +166,9 @@ export declare function foo(): string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename:: 
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename:: 
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
index 559a7dba4e83f..3e010dd8582e3 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
@@ -76,19 +76,9 @@ Input::
 //// [/a/username/project/src/file1.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 rename:: file1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/username/project 1 change:: src
-sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 rename:: file2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/username/project 1 change:: src
-
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 rename:: file2.js
-sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/username/project 1 change:: src
 [12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
index 71b85643f6825..571d2cfcb72c0 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
@@ -62,8 +62,6 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myprojec
 FileWatcher:: Added:: WatchInfo: /home/user/projects/myproject/node_modules/reala/package.json 2000 undefined package.json file
 DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /home/user/projects/myproject/src 1 rename:: file.js
-sysLog:: watchPresentFileSystemEntry:: /home/user/projects/myproject/src 1 change:: 
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 undefined Wild card directory
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
index 9c8046450650b..5f9740db448a6 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
@@ -126,17 +126,9 @@ export const x = 10;
 //// [/user/username/projects/myproject/src/file2.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: renamed.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: file1.js
 error TS6053: File '/user/username/projects/myproject/src/file2.ts' not found.
   The file is in the program because:
     Matched by default include pattern '**/*'
@@ -192,9 +184,6 @@ Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 rename:: renamed.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: dist
 user/username/projects/myproject/src/file1.ts:1:19 - error TS2307: Cannot find module './file2' or its corresponding type declarations.
 
 1 import { x } from "./file2";
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
index df4cbd683cf3e..59faa168aad77 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
@@ -134,10 +134,6 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -178,12 +174,6 @@ Output::
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 rename:: file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: dist
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 rename:: file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: dist
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
index 58e1a7dd71c2f..ae378d1bdd38e 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
@@ -27,8 +27,6 @@ Output::
 >> Screen clear
 [12:00:29 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file1.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
@@ -126,21 +124,9 @@ Input::
 //// [/user/username/projects/myproject/node_modules/file2/index.d.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/file2 1 rename:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/file2 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: file2
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/file2 1 rename:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: file2
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: file1.js
 user/username/projects/myproject/src/file1.ts:1:19 - error TS2307: Cannot find module 'file2' or its corresponding type declarations.
 
 1 import { x } from "file2";
@@ -243,10 +229,6 @@ Change:: Start npm install
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -276,10 +258,6 @@ Change:: npm install folder creation of file2
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: file2
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -312,8 +290,6 @@ export const x = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: file2
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -408,7 +384,6 @@ Output::
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: file1.js
 [12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
index ee3b0cb995f2d..48df9d0d09b1d 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
@@ -78,8 +78,6 @@ var zz30 = 100;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.ts
-
 
 WatchedFiles::
 /a/b/node_modules/@types:
@@ -102,8 +100,6 @@ Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
 [12:00:33 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
index 25f4f1161f65f..37d63eb42a659 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
@@ -97,8 +97,6 @@ var zz30 = 100;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.ts
-
 
 WatchedFiles::
 /a/b/node_modules/@types:
@@ -121,8 +119,6 @@ Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
index ff40d55d26c25..8a4d9817b7fc4 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
@@ -50,10 +50,8 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Failed Lookup Locations
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/bar/package.json 2000 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} package.json file
 ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Wild card directory
@@ -119,9 +117,6 @@ Input::
 //// [/user/username/projects/myproject/node_modules/bar/fooBar.d.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/bar/fooBar.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
index ecbbd881cd06e..17445c13fa132 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
@@ -52,8 +52,6 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/bar/package.json 2000 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} package.json file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Wild card directory
@@ -173,8 +171,6 @@ export function temp(): string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/bar 1 change:: temp
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
index 396906bdcf693..d633c62afa8a6 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
@@ -36,8 +36,6 @@ Output::
 >> Screen clear
 [12:00:37 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -146,8 +144,6 @@ export function temp(): string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/bar 1 change:: temp
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
index ca464f91011d0..77eb64d93475c 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
@@ -36,8 +36,6 @@ Output::
 >> Screen clear
 [12:00:37 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -101,9 +99,6 @@ Input::
 //// [/user/username/projects/myproject/node_modules/bar/fooBar.d.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/bar/fooBar.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
index 75ef71c5a1607..88d25cde1fcc5 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
@@ -52,10 +52,8 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/bar/package.json 2000 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} package.json file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Wild card directory
@@ -121,9 +119,6 @@ export function fooBar(): string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: bar/foo.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar/foo.d.ts
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
index e516101ea4f18..54ce05a590cbf 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
@@ -36,8 +36,6 @@ Output::
 >> Screen clear
 [12:00:37 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -101,9 +99,6 @@ export function fooBar(): string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: bar/foo.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar/foo.d.ts
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:

From 78377e17af402f07673060dce00c2c00bd0aeaaa Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 25 May 2022 13:22:26 -0700
Subject: [PATCH 11/15] Add test when rename event occurs on mac with ~
 appended to file name

---
 src/harness/virtualFileSystemWithWatch.ts     |  48 +++--
 .../unittests/tscWatch/watchEnvironment.ts    |  30 +++
 ...inode-when-rename-event-ends-with-tilde.js | 200 ++++++++++++++++++
 3 files changed, 256 insertions(+), 22 deletions(-)
 create mode 100644 tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js

diff --git a/src/harness/virtualFileSystemWithWatch.ts b/src/harness/virtualFileSystemWithWatch.ts
index 3bf80f19c8538..77ba9a205f25c 100644
--- a/src/harness/virtualFileSystemWithWatch.ts
+++ b/src/harness/virtualFileSystemWithWatch.ts
@@ -297,6 +297,8 @@ interface Array<T> { length: number; [n: number]: T; }`
         ignoreDelete: boolean;
         /** Skip inode check on file or folder create*/
         skipInodeCheckOnCreate: boolean;
+        /** When invoking rename event on fs watch, send event with file name suffixed with tilde */
+        useTildeAsSuffixInRenameEventFileName: boolean;
     }
 
     export enum Tsc_WatchFile {
@@ -490,11 +492,11 @@ interface Array<T> { length: number; [n: number]: T; }`
                 if (options && options.invokeDirectoryWatcherInsteadOfFileChanged) {
                     const directoryFullPath = getDirectoryPath(currentEntry.fullPath);
                     this.invokeFileWatcher(directoryFullPath, FileWatcherEventKind.Changed, /*useFileNameInCallback*/ true);
-                    this.invokeFsWatchesCallbacks(directoryFullPath, "rename", currentEntry.fullPath);
-                    this.invokeRecursiveFsWatches(directoryFullPath, "rename", currentEntry.fullPath);
+                    this.invokeFsWatchesCallbacks(directoryFullPath, "rename", currentEntry.fullPath, options.useTildeAsSuffixInRenameEventFileName);
+                    this.invokeRecursiveFsWatches(directoryFullPath, "rename", currentEntry.fullPath, options.useTildeAsSuffixInRenameEventFileName);
                 }
                 else {
-                    this.invokeFileAndFsWatches(currentEntry.fullPath, FileWatcherEventKind.Changed);
+                    this.invokeFileAndFsWatches(currentEntry.fullPath, FileWatcherEventKind.Changed, options?.useTildeAsSuffixInRenameEventFileName);
                 }
             }
         }
@@ -618,8 +620,8 @@ interface Array<T> { length: number; [n: number]: T; }`
             }
             const inodeWatching = this.inodeWatching;
             if (options?.skipInodeCheckOnCreate) this.inodeWatching = false;
-            this.invokeFileAndFsWatches(fileOrDirectory.fullPath, FileWatcherEventKind.Created);
-            this.invokeFileAndFsWatches(folder.fullPath, FileWatcherEventKind.Changed);
+            this.invokeFileAndFsWatches(fileOrDirectory.fullPath, FileWatcherEventKind.Created, options?.useTildeAsSuffixInRenameEventFileName);
+            this.invokeFileAndFsWatches(folder.fullPath, FileWatcherEventKind.Changed, options?.useTildeAsSuffixInRenameEventFileName);
             this.inodeWatching = inodeWatching;
         }
 
@@ -636,9 +638,9 @@ interface Array<T> { length: number; [n: number]: T; }`
             if (isFsFolder(fileOrDirectory)) {
                 Debug.assert(fileOrDirectory.entries.length === 0 || isRenaming);
             }
-            if (!options?.ignoreDelete) this.invokeFileAndFsWatches(fileOrDirectory.fullPath, FileWatcherEventKind.Deleted);
+            if (!options?.ignoreDelete) this.invokeFileAndFsWatches(fileOrDirectory.fullPath, FileWatcherEventKind.Deleted, options?.useTildeAsSuffixInRenameEventFileName);
             this.inodes?.delete(fileOrDirectory.path);
-            if (!options?.ignoreDelete) this.invokeFileAndFsWatches(baseFolder.fullPath, FileWatcherEventKind.Changed);
+            if (!options?.ignoreDelete) this.invokeFileAndFsWatches(baseFolder.fullPath, FileWatcherEventKind.Changed, options?.useTildeAsSuffixInRenameEventFileName);
         }
 
         deleteFile(filePath: string) {
@@ -700,45 +702,47 @@ interface Array<T> { length: number; [n: number]: T; }`
             invokeWatcherCallbacks(this.watchedFiles.get(this.toPath(fileFullPath)), ({ cb, fileName }) => cb(useFileNameInCallback ? fileName : fileFullPath, eventKind));
         }
 
-        private fsWatchCallback(map: MultiMap<Path, TestFsWatcher>, fullPath: string, eventName: "rename" | "change", entryFullPath?: string) {
+        private fsWatchCallback(map: MultiMap<Path, TestFsWatcher>, fullPath: string, eventName: "rename" | "change", entryFullPath: string | undefined, useTildeSuffix: boolean | undefined) {
             const path = this.toPath(fullPath);
             const currentInode = this.inodes?.get(path);
             invokeWatcherCallbacks(map.get(path), ({ cb, inode }) => {
                 // TODO::
                 if (this.inodeWatching && inode !== undefined && inode !== currentInode) return;
-                cb(eventName, entryFullPath ? this.getRelativePathToDirectory(fullPath, entryFullPath) : "");
+                let relativeFileName = (entryFullPath ? this.getRelativePathToDirectory(fullPath, entryFullPath) : "");
+                if (useTildeSuffix) relativeFileName = (relativeFileName ? relativeFileName : getBaseFileName(fullPath)) + "~";
+                cb(eventName, relativeFileName);
             });
         }
 
-        invokeFsWatchesCallbacks(fullPath: string, eventName: "rename" | "change", entryFullPath?: string) {
-            this.fsWatchCallback(this.fsWatches, fullPath, eventName, entryFullPath);
+        invokeFsWatchesCallbacks(fullPath: string, eventName: "rename" | "change", entryFullPath?: string, useTildeSuffix?: boolean) {
+            this.fsWatchCallback(this.fsWatches, fullPath, eventName, entryFullPath, useTildeSuffix);
         }
 
-        invokeFsWatchesRecursiveCallbacks(fullPath: string, eventName: "rename" | "change", entryFullPath?: string) {
-            this.fsWatchCallback(this.fsWatchesRecursive, fullPath, eventName, entryFullPath);
+        invokeFsWatchesRecursiveCallbacks(fullPath: string, eventName: "rename" | "change", entryFullPath?: string, useTildeSuffix?: boolean) {
+            this.fsWatchCallback(this.fsWatchesRecursive, fullPath, eventName, entryFullPath, useTildeSuffix);
         }
 
         private getRelativePathToDirectory(directoryFullPath: string, fileFullPath: string) {
             return getRelativePathToDirectoryOrUrl(directoryFullPath, fileFullPath, this.currentDirectory, this.getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
         }
 
-        private invokeRecursiveFsWatches(fullPath: string, eventName: "rename" | "change", entryFullPath?: string) {
-            this.invokeFsWatchesRecursiveCallbacks(fullPath, eventName, entryFullPath);
+        private invokeRecursiveFsWatches(fullPath: string, eventName: "rename" | "change", entryFullPath?: string, useTildeSuffix?: boolean) {
+            this.invokeFsWatchesRecursiveCallbacks(fullPath, eventName, entryFullPath, useTildeSuffix);
             const basePath = getDirectoryPath(fullPath);
             if (this.getCanonicalFileName(fullPath) !== this.getCanonicalFileName(basePath)) {
-                this.invokeRecursiveFsWatches(basePath, eventName, entryFullPath || fullPath);
+                this.invokeRecursiveFsWatches(basePath, eventName, entryFullPath || fullPath, useTildeSuffix);
             }
         }
 
-        private invokeFsWatches(fullPath: string, eventName: "rename" | "change") {
-            this.invokeFsWatchesCallbacks(fullPath, eventName);
-            this.invokeFsWatchesCallbacks(getDirectoryPath(fullPath), eventName, fullPath);
-            this.invokeRecursiveFsWatches(fullPath, eventName);
+        private invokeFsWatches(fullPath: string, eventName: "rename" | "change", useTildeSuffix: boolean | undefined) {
+            this.invokeFsWatchesCallbacks(fullPath, eventName, fullPath, useTildeSuffix);
+            this.invokeFsWatchesCallbacks(getDirectoryPath(fullPath), eventName, fullPath, useTildeSuffix);
+            this.invokeRecursiveFsWatches(fullPath, eventName, /*entryFullPath*/ undefined, useTildeSuffix);
         }
 
-        private invokeFileAndFsWatches(fileOrFolderFullPath: string, eventKind: FileWatcherEventKind) {
+        private invokeFileAndFsWatches(fileOrFolderFullPath: string, eventKind: FileWatcherEventKind, useTildeSuffix?: boolean) {
             this.invokeFileWatcher(fileOrFolderFullPath, eventKind);
-            this.invokeFsWatches(fileOrFolderFullPath, eventKind === FileWatcherEventKind.Changed ? "change" : "rename");
+            this.invokeFsWatches(fileOrFolderFullPath, eventKind === FileWatcherEventKind.Changed ? "change" : "rename", useTildeSuffix);
         }
 
         private toFsEntry(path: string): FSEntryBase {
diff --git a/src/testRunner/unittests/tscWatch/watchEnvironment.ts b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
index 7428d9d1a1595..8eee88bae654a 100644
--- a/src/testRunner/unittests/tscWatch/watchEnvironment.ts
+++ b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
@@ -648,6 +648,36 @@ namespace ts.tscWatch {
                 ]
             });
 
+            verifyTscWatch({
+                scenario,
+                subScenario: `fsWatch/when using file watching thats on inode when rename event ends with tilde`,
+                commandLineArgs: ["-w", "--extendedDiagnostics"],
+                sys: () => createWatchedSystem(
+                    {
+                        [libFile.path]: libFile.content,
+                        [`${projectRoot}/main.ts`]: `import { foo } from "./foo"; foo();`,
+                        [`${projectRoot}/foo.d.ts`]: `export function foo(): string;`,
+                        [`${projectRoot}/tsconfig.json`]: JSON.stringify({ watchOptions: { watchFile: "useFsEvents" }, files: ["foo.d.ts", "main.ts"] }),
+                    },
+                    {
+                        currentDirectory: projectRoot,
+                        inodeWatching: true
+                    }
+                ),
+                changes: [
+                    {
+                        caption: "Replace file with rename event that introduces error",
+                        change: sys => sys.modifyFile(`${projectRoot}/foo.d.ts`, `export function foo2(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true, useTildeAsSuffixInRenameEventFileName: true }),
+                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                    },
+                    {
+                        caption: "Replace file with rename event that fixes error",
+                        change: sys => sys.modifyFile(`${projectRoot}/foo.d.ts`, `export function foo(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true, useTildeAsSuffixInRenameEventFileName: true }),
+                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(0),
+                    },
+                ]
+            });
+
             verifyTscWatch({
                 scenario,
                 subScenario: `fsWatch/when using file watching thats on inode when rename occurs when file is still on the disk`,
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
new file mode 100644
index 0000000000000..91667a046e039
--- /dev/null
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
@@ -0,0 +1,200 @@
+Input::
+//// [/a/lib/lib.d.ts] Inode:: 3
+/// <reference no-default-lib="true"/>
+interface Boolean {}
+interface Function {}
+interface CallableFunction {}
+interface NewableFunction {}
+interface IArguments {}
+interface Number { toExponential: any; }
+interface Object {}
+interface RegExp {}
+interface String { charAt: any; }
+interface Array<T> { length: number; [n: number]: T; }
+
+//// [/user/username/projects/myproject/main.ts] Inode:: 8
+import { foo } from "./foo"; foo();
+
+//// [/user/username/projects/myproject/foo.d.ts] Inode:: 9
+export function foo(): string;
+
+//// [/user/username/projects/myproject/tsconfig.json] Inode:: 10
+{"watchOptions":{"watchFile":"useFsEvents"},"files":["foo.d.ts","main.ts"]}
+
+
+/a/lib/tsc.js -w --extendedDiagnostics
+Output::
+[12:00:23 AM] Starting compilation in watch mode...
+
+Current directory: /user/username/projects/myproject CaseSensitiveFileNames: false
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/tsconfig.json 2000 {"watchFile":4} Config file
+Synchronizing program
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/main.ts 250 {"watchFile":4} Source file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 {"watchFile":4} Source file
+DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
+Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+[12:00:26 AM] Found 0 errors. Watching for file changes.
+
+
+
+Program root files: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
+Program options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+Program structureReused: Not
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.d.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.d.ts
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/a/lib/lib.d.ts (used version)
+/user/username/projects/myproject/foo.d.ts (used version)
+/user/username/projects/myproject/main.ts (used version)
+
+WatchedFiles::
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+/user/username/projects/myproject/tsconfig.json:
+  {"directoryName":"/user/username/projects/myproject/tsconfig.json","inode":10}
+/user/username/projects/myproject/foo.d.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.d.ts","inode":9}
+/user/username/projects/myproject/main.ts:
+  {"directoryName":"/user/username/projects/myproject/main.ts","inode":8}
+/user/username/projects/myproject:
+  {"directoryName":"/user/username/projects/myproject","inode":7}
+/a/lib/lib.d.ts:
+  {"directoryName":"/a/lib/lib.d.ts","inode":3}
+
+FsWatchesRecursive::
+
+exitCode:: ExitStatus.undefined
+
+//// [/user/username/projects/myproject/main.js] Inode:: 11
+"use strict";
+exports.__esModule = true;
+var foo_1 = require("./foo");
+(0, foo_1.foo)();
+
+
+
+Change:: Replace file with rename event that introduces error
+
+Input::
+//// [/user/username/projects/myproject/foo.d.ts] Inode:: 12
+export function foo2(): string;
+
+
+Output::
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Synchronizing program
+[12:00:30 AM] File change detected. Starting incremental compilation...
+
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+main.ts:1:10 - error TS2724: '"./foo"' has no exported member named 'foo'. Did you mean 'foo2'?
+
+1 import { foo } from "./foo"; foo();
+           ~~~
+
+  foo.d.ts:1:17
+    1 export function foo2(): string;
+                      ~~~~
+    'foo2' is declared here.
+
+[12:00:34 AM] Found 1 error. Watching for file changes.
+
+
+
+Program root files: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
+Program options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+Program structureReused: SafeModules
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.d.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/foo.d.ts
+/user/username/projects/myproject/main.ts
+
+Shape signatures in builder refreshed for::
+/user/username/projects/myproject/foo.d.ts (used version)
+/user/username/projects/myproject/main.ts (computed .d.ts)
+
+WatchedFiles::
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+/user/username/projects/myproject/tsconfig.json:
+  {"directoryName":"/user/username/projects/myproject/tsconfig.json","inode":10}
+/user/username/projects/myproject/foo.d.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.d.ts","inode":9}
+/user/username/projects/myproject/main.ts:
+  {"directoryName":"/user/username/projects/myproject/main.ts","inode":8}
+/user/username/projects/myproject:
+  {"directoryName":"/user/username/projects/myproject","inode":7}
+/a/lib/lib.d.ts:
+  {"directoryName":"/a/lib/lib.d.ts","inode":3}
+
+FsWatchesRecursive::
+
+exitCode:: ExitStatus.undefined
+
+//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 11
+
+Change:: Replace file with rename event that fixes error
+
+Input::
+//// [/user/username/projects/myproject/foo.d.ts] Inode:: 13
+export function foo(): string;
+
+
+Output::
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+
+
+WatchedFiles::
+/user/username/projects/myproject/node_modules/@types:
+  {"fileName":"/user/username/projects/myproject/node_modules/@types","pollingInterval":500}
+
+FsWatches::
+/user/username/projects/myproject/tsconfig.json:
+  {"directoryName":"/user/username/projects/myproject/tsconfig.json","inode":10}
+/user/username/projects/myproject/foo.d.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.d.ts","inode":9}
+/user/username/projects/myproject/main.ts:
+  {"directoryName":"/user/username/projects/myproject/main.ts","inode":8}
+/user/username/projects/myproject:
+  {"directoryName":"/user/username/projects/myproject","inode":7}
+/a/lib/lib.d.ts:
+  {"directoryName":"/a/lib/lib.d.ts","inode":3}
+
+FsWatchesRecursive::
+
+exitCode:: ExitStatus.undefined
+

From 8e036e5961addb07d35537bd2f388cdd86acd21d Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 25 May 2022 14:20:29 -0700
Subject: [PATCH 12/15] If the relativeFileName ends with tilde, remove it from
 the event

---
 src/compiler/sys.ts                           |  5 +-
 .../unittests/tscWatch/watchEnvironment.ts    |  4 +-
 ...inode-when-rename-event-ends-with-tilde.js | 74 ++++++++++++++++---
 3 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index c0ab1065755a8..2b38e36f96af7 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1081,7 +1081,7 @@ namespace ts {
             let lastDirectoryPartWithDirectorySeparator: string | undefined;
             let lastDirectoryPart: string | undefined;
             if (inodeWatching) {
-                lastDirectoryPartWithDirectorySeparator = fileOrDirectory.substr(fileOrDirectory.lastIndexOf(directorySeparator));
+                lastDirectoryPartWithDirectorySeparator = fileOrDirectory.substring(fileOrDirectory.lastIndexOf(directorySeparator));
                 lastDirectoryPart = lastDirectoryPartWithDirectorySeparator.slice(directorySeparator.length);
             }
             /** Watcher for the file system entry depending on whether it is missing or present */
@@ -1140,13 +1140,14 @@ namespace ts {
             }
 
             function callbackChangingToMissingFileSystemEntry(event: "rename" | "change", relativeName: string | undefined) {
+                if (relativeName && endsWith(relativeName, "~")) relativeName = relativeName.slice(0, relativeName.length - 1);
                 callback(event, relativeName);
                 // because relativeName is not guaranteed to be correct we need to check on each rename with few combinations
                 // Eg on ubuntu while watching app/node_modules the relativeName is "node_modules" which is neither relative nor full path
                 if (event === "rename" &&
                     (!relativeName ||
                         relativeName === lastDirectoryPart ||
-                        (relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator!) !== -1 && relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator!) === relativeName.length - lastDirectoryPartWithDirectorySeparator!.length))) {
+                        endsWith(relativeName, lastDirectoryPartWithDirectorySeparator!))) {
                     if (inodeWatching) {
                         updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
                     }
diff --git a/src/testRunner/unittests/tscWatch/watchEnvironment.ts b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
index 8eee88bae654a..95cacc1e7d088 100644
--- a/src/testRunner/unittests/tscWatch/watchEnvironment.ts
+++ b/src/testRunner/unittests/tscWatch/watchEnvironment.ts
@@ -668,12 +668,12 @@ namespace ts.tscWatch {
                     {
                         caption: "Replace file with rename event that introduces error",
                         change: sys => sys.modifyFile(`${projectRoot}/foo.d.ts`, `export function foo2(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true, useTildeAsSuffixInRenameEventFileName: true }),
-                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(1),
+                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2),
                     },
                     {
                         caption: "Replace file with rename event that fixes error",
                         change: sys => sys.modifyFile(`${projectRoot}/foo.d.ts`, `export function foo(): string;`, { invokeFileDeleteCreateAsPartInsteadOfChange: true, useTildeAsSuffixInRenameEventFileName: true }),
-                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(0),
+                        timeouts: sys => sys.checkTimeoutQueueLengthAndRun(2),
                     },
                 ]
             });
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
index 91667a046e039..534e0e7161485 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
@@ -102,10 +102,21 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
-DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Scheduling invalidateFailedLookup
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Scheduling invalidateFailedLookup, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Synchronizing program
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
@@ -149,14 +160,14 @@ WatchedFiles::
 FsWatches::
 /user/username/projects/myproject/tsconfig.json:
   {"directoryName":"/user/username/projects/myproject/tsconfig.json","inode":10}
-/user/username/projects/myproject/foo.d.ts:
-  {"directoryName":"/user/username/projects/myproject/foo.d.ts","inode":9}
 /user/username/projects/myproject/main.ts:
   {"directoryName":"/user/username/projects/myproject/main.ts","inode":8}
 /user/username/projects/myproject:
   {"directoryName":"/user/username/projects/myproject","inode":7}
 /a/lib/lib.d.ts:
   {"directoryName":"/a/lib/lib.d.ts","inode":3}
+/user/username/projects/myproject/foo.d.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.d.ts","inode":12}
 
 FsWatchesRecursive::
 
@@ -172,11 +183,49 @@ export function foo(): string;
 
 
 Output::
-DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Scheduling invalidateFailedLookup
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Scheduling invalidateFailedLookup, Cancelled earlier one
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Synchronizing program
+[12:00:38 AM] File change detected. Starting incremental compilation...
+
+CreatingProgramWith::
+  roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
+  options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+[12:00:42 AM] Found 0 errors. Watching for file changes.
+
+
+
+Program root files: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
+Program options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+Program structureReused: SafeModules
+Program files::
+/a/lib/lib.d.ts
+/user/username/projects/myproject/foo.d.ts
+/user/username/projects/myproject/main.ts
+
+Semantic diagnostics in builder refreshed for::
+/user/username/projects/myproject/foo.d.ts
+/user/username/projects/myproject/main.ts
 
+Shape signatures in builder refreshed for::
+/user/username/projects/myproject/foo.d.ts (used version)
+/user/username/projects/myproject/main.ts (computed .d.ts)
 
 WatchedFiles::
 /user/username/projects/myproject/node_modules/@types:
@@ -185,16 +234,17 @@ WatchedFiles::
 FsWatches::
 /user/username/projects/myproject/tsconfig.json:
   {"directoryName":"/user/username/projects/myproject/tsconfig.json","inode":10}
-/user/username/projects/myproject/foo.d.ts:
-  {"directoryName":"/user/username/projects/myproject/foo.d.ts","inode":9}
 /user/username/projects/myproject/main.ts:
   {"directoryName":"/user/username/projects/myproject/main.ts","inode":8}
 /user/username/projects/myproject:
   {"directoryName":"/user/username/projects/myproject","inode":7}
 /a/lib/lib.d.ts:
   {"directoryName":"/a/lib/lib.d.ts","inode":3}
+/user/username/projects/myproject/foo.d.ts:
+  {"directoryName":"/user/username/projects/myproject/foo.d.ts","inode":13}
 
 FsWatchesRecursive::
 
 exitCode:: ExitStatus.undefined
 
+//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 11

From e1ba8a8d5f2f30cc039a89a1e8e4e6c64ba7c44d Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Mon, 23 May 2022 15:30:56 -0700
Subject: [PATCH 13/15] Some logging for debugging further

---
 src/compiler/sys.ts                           |  20 +-
 .../demo/updates-with-bad-reference.js        |   2 +
 .../demo/updates-with-circular-reference.js   |   2 +
 ...for-changes-to-package-json-main-fields.js |   5 +
 ...t-correctly-with-cts-and-mts-extensions.js |  21 ++
 ...n-no-files-are-emitted-with-incremental.js |   6 +
 ...when-watching-when-no-files-are-emitted.js |   4 +
 ...mit-any-files-on-error-with-incremental.js |  41 +++
 .../does-not-emit-any-files-on-error.js       |  32 ++
 .../incremental-updates-in-verbose-mode.js    |  14 +
 .../when-file-with-no-error-changes.js        |   4 +
 ...ing-errors-only-changed-file-is-emitted.js |  10 +
 .../when-file-with-no-error-changes.js        |   2 +
 ...ixing-error-files-all-files-are-emitted.js |  14 +
 .../when-preserveWatchOutput-is-not-used.js   |   8 +
 ...veWatchOutput-is-passed-on-command-line.js |   6 +
 ...e-of-program-emit-with-outDir-specified.js |  13 +
 ...r-recompilation-because-of-program-emit.js |  17 +
 ...tches-config-files-that-are-not-present.js |  10 +
 ...e-down-stream-project-and-then-fixes-it.js |  13 +
 ...ncing-project-even-for-non-local-change.js |  24 ++
 ...le-is-added,-and-its-subsequent-updates.js |  31 ++
 ...hanges-and-reports-found-errors-message.js |  40 +++
 ...not-start-build-of-referencing-projects.js |  12 +
 ...le-is-added,-and-its-subsequent-updates.js |  38 +++
 ...hanges-and-reports-found-errors-message.js |  46 +++
 ...not-start-build-of-referencing-projects.js |  14 +
 ...hen-noUnusedParameters-changes-to-false.js |   4 +
 .../works-with-extended-source-files.js       |  13 +
 ...hen-there-are-23-projects-in-a-solution.js | 303 ++++++++++++++++++
 ...when-there-are-3-projects-in-a-solution.js |  24 ++
 ...when-there-are-5-projects-in-a-solution.js |  36 +++
 ...when-there-are-8-projects-in-a-solution.js | 102 ++++++
 .../publicApi/with-custom-transformers.js     |   9 +
 .../reexport/Reports-errors-correctly.js      |   4 +
 ...e-projects-with-single-watcher-per-file.js |   7 +
 .../same-file-in-multiple-projects.js         |   7 +
 .../createWatchOfConfigFile.js                |   2 +
 ...Result-on-WatchCompilerHostOfConfigFile.js |   2 +
 ...s-deleted-and-created-as-part-of-change.js |   6 +
 .../should-emit-specified-file.js             |   9 +
 ...elf-if-'--isolatedModules'-is-specified.js |   3 +
 ...-if-'--out'-or-'--outFile'-is-specified.js |   3 +
 ...should-be-up-to-date-with-deleted-files.js |   6 +
 ...-be-up-to-date-with-newly-created-files.js |   9 +
 ...-to-date-with-the-reference-map-changes.js |  21 ++
 ...les-referencing-it-if-its-shape-changed.js |   8 +
 .../should-detect-non-existing-code-file.js   |   9 +
 .../should-detect-removed-code-file.js        |   4 +
 ...ll-files-if-a-global-file-changed-shape.js |   7 +
 ...ould-return-cascaded-affected-file-list.js |  16 +
 ...fine-for-files-with-circular-references.js |   4 +
 .../config-does-not-have-out-or-outFile.js    |   8 +
 .../config-has-out.js                         |   6 +
 .../config-has-outFile.js                     |   6 +
 ...-recursive-directory-watcher-is-invoked.js |   2 +
 .../errors-for-.d.ts-change.js                |  11 +
 .../errors-for-.ts-change.js                  |  13 +
 ...g-a-deep-multilevel-import-that-changes.js |  15 +
 .../with-noEmitOnError-with-incremental.js    |  31 ++
 .../with-noEmitOnError.js                     |  27 ++
 .../errors-for-.d.ts-change.js                |  13 +
 .../errors-for-.ts-change.js                  |  18 ++
 ...g-a-deep-multilevel-import-that-changes.js |  18 ++
 .../with-noEmitOnError-with-incremental.js    |  38 +++
 .../with-noEmitOnError.js                     |  34 ++
 .../errors-for-.d.ts-change.js                |  11 +
 .../errors-for-.ts-change.js                  |  13 +
 ...g-a-deep-multilevel-import-that-changes.js |  15 +
 .../with-noEmitOnError-with-incremental.js    |  31 ++
 .../default/with-noEmitOnError.js             |  27 ++
 .../errors-for-.d.ts-change.js                |  19 ++
 .../errors-for-.ts-change.js                  |  21 ++
 ...g-a-deep-multilevel-import-that-changes.js |  24 ++
 .../with-noEmitOnError-with-incremental.js    |  38 +++
 .../defaultAndD/with-noEmitOnError.js         |  34 ++
 .../errors-for-.d.ts-change.js                |  27 ++
 .../errors-for-.ts-change.js                  |  19 ++
 ...g-a-deep-multilevel-import-that-changes.js |  21 ++
 .../with-noEmitOnError-with-incremental.js    |  31 ++
 .../with-noEmitOnError.js                     |  31 ++
 .../errors-for-.d.ts-change.js                |  29 ++
 .../errors-for-.ts-change.js                  |  24 ++
 ...g-a-deep-multilevel-import-that-changes.js |  24 ++
 .../with-noEmitOnError-with-incremental.js    |  38 +++
 .../with-noEmitOnError.js                     |  38 +++
 .../errors-for-.d.ts-change.js                |  27 ++
 .../errors-for-.ts-change.js                  |  19 ++
 ...g-a-deep-multilevel-import-that-changes.js |  21 ++
 .../with-noEmitOnError-with-incremental.js    |  31 ++
 .../incremental/default/with-noEmitOnError.js |  31 ++
 .../errors-for-.d.ts-change.js                |  35 ++
 .../errors-for-.ts-change.js                  |  27 ++
 ...g-a-deep-multilevel-import-that-changes.js |  30 ++
 .../with-noEmitOnError-with-incremental.js    |  38 +++
 .../defaultAndD/with-noEmitOnError.js         |  38 +++
 .../errors-for-.d.ts-change.js                |  27 ++
 .../errors-for-.ts-change.js                  |  15 +
 ...g-a-deep-multilevel-import-that-changes.js |  15 +
 .../with-noEmitOnError-with-incremental.js    |  31 ++
 .../isolatedModules/with-noEmitOnError.js     |  31 ++
 .../errors-for-.d.ts-change.js                |  35 ++
 .../errors-for-.ts-change.js                  |  24 ++
 ...g-a-deep-multilevel-import-that-changes.js |  30 ++
 .../with-noEmitOnError-with-incremental.js    |  38 +++
 .../isolatedModulesAndD/with-noEmitOnError.js |  38 +++
 .../errors-for-.d.ts-change.js                |  11 +
 .../errors-for-.ts-change.js                  |   9 +
 ...g-a-deep-multilevel-import-that-changes.js |   9 +
 .../with-noEmitOnError-with-incremental.js    |  31 ++
 .../isolatedModules/with-noEmitOnError.js     |  27 ++
 .../errors-for-.d.ts-change.js                |  19 ++
 .../errors-for-.ts-change.js                  |  18 ++
 ...g-a-deep-multilevel-import-that-changes.js |  24 ++
 .../with-noEmitOnError-with-incremental.js    |  38 +++
 .../isolatedModulesAndD/with-noEmitOnError.js |  34 ++
 ...n-Windows-style-drive-root-is-lowercase.js |   4 +
 ...n-Windows-style-drive-root-is-uppercase.js |   4 +
 ...ry-symlink-target-and-import-match-disk.js |   3 +
 ...le-symlink-target-and-import-match-disk.js |   4 +
 ...nging-module-name-with-different-casing.js |   3 +
 ...target-matches-disk-but-import-does-not.js |   3 +
 ...target-matches-disk-but-import-does-not.js |   4 +
 ...link-target,-and-disk-are-all-different.js |   3 +
 ...link-target,-and-disk-are-all-different.js |  11 +
 ...link-target-agree-but-do-not-match-disk.js |   3 +
 ...link-target-agree-but-do-not-match-disk.js |   4 +
 ...k-but-directory-symlink-target-does-not.js |   3 +
 ...s-disk-but-file-symlink-target-does-not.js |   4 +
 ...ative-information-file-location-changes.js |   3 +
 ...hen-renaming-file-with-different-casing.js |   5 +
 .../editing-module-augmentation-watch.js      |   3 +
 ...for-changes-to-package-json-main-fields.js |   4 +
 .../esm-mode-file-is-edited.js                |   2 +
 ...configFile-contents-when-options-change.js |   2 +
 ...rts-errors-when-the-config-file-changes.js |   4 +
 ...nostics-when-'--noUnusedLabels'-changes.js |   4 +
 ...-a-configured-program-without-file-list.js |   6 +
 ...hould-remove-the-module-not-found-error.js |   5 +
 ...ot-files-has-changed-(new-file-on-disk).js |   6 +
 ...-root-files-has-changed-through-include.js |   5 +
 .../programUpdates/change-module-to-none.js   |   3 +
 .../programUpdates/config-file-is-deleted.js  |   2 +
 ...s-changes-in-lib-section-of-config-file.js |   3 +
 ...keys-differ-only-in-directory-seperator.js |  13 +
 .../create-watch-without-config-file.js       |   2 +
 ...eleted-files-affect-project-structure-2.js |   1 +
 .../deleted-files-affect-project-structure.js |   1 +
 .../handle-recreated-files-correctly.js       |  13 +
 ...tore-the-states-for-configured-projects.js |  25 ++
 ...estore-the-states-for-inferred-projects.js |   6 +
 ...rors-correctly-with-file-not-in-rootDir.js |   3 +
 ...s-errors-correctly-with-isolatedModules.js |   3 +
 .../declarationDir-is-specified.js            |  13 +
 ...-outDir-and-declarationDir-is-specified.js |   9 +
 .../when-outDir-is-specified.js               |   7 +
 .../with-outFile.js                           |   6 +
 ...e-is-specified-with-declaration-enabled.js |  17 +
 .../without-outDir-or-outFile-is-specified.js |  11 +
 ...odule-resolution-changes-in-config-file.js |   1 +
 ...tes-diagnostics-and-emit-for-decorators.js |   6 +
 ...it-when-useDefineForClassFields-changes.js |   3 +
 .../updates-emit-on-jsx-option-change.js      |   4 +
 ...mit-when-importsNotUsedAsValues-changes.js |  12 +
 ...on-emit-is-disabled-in-compiler-options.js |   8 +
 ...when-ambient-modules-of-program-changes.js |  10 +
 ...orceConsistentCasingInFileNames-changes.js |   2 +
 ...s-errors-when-noErrorTruncation-changes.js |   2 +
 ...es-errors-when-strictNullChecks-changes.js |   6 +
 ...solution-when-resolveJsonModule-changes.js |   7 +
 ...and-new-file-is-added-as-part-of-change.js |   7 +
 .../when-creating-extensionless-file.js       |   2 +
 ...n-creating-new-file-in-symlinked-folder.js |   4 +
 ...file-is-added-to-the-referenced-project.js |  24 ++
 ...ibCheck-and-skipDefaultLibCheck-changes.js |  12 +
 .../on-sample-project.js                      |  23 ++
 ...-different-folders-with-no-files-clause.js |  51 +++
 ...nsitive-references-in-different-folders.js |  32 ++
 .../tscWatch/resolutionCache/caching-works.js |  14 +
 .../watch-with-configFile.js                  |  13 +
 .../watch-without-configFile.js               |   9 +
 .../loads-missing-files-from-disk.js          |   9 +
 ...module-goes-missing-and-then-comes-back.js |  11 +
 ...are-global-and-installed-at-later-point.js |  26 ++
 ...-no-notification-from-fs-for-index-file.js |  78 +++++
 ...le-resolution-changes-to-ambient-module.js |  20 ++
 ...der-that-already-contains-@types-folder.js |  11 +
 ...rogram-with-files-from-external-library.js |   2 +
 .../extraFileExtensions-are-supported.js      |   5 +
 ...createSemanticDiagnosticsBuilderProgram.js |   2 +
 ...ing-useSourceOfProjectReferenceRedirect.js |  24 ++
 ...-host-implementing-getParsedCommandLine.js |  12 +
 ...-timesouts-on-host-program-gets-updated.js |   5 +
 ...inode-when-rename-event-ends-with-tilde.js |  32 ++
 ...e-occurs-when-file-is-still-on-the-disk.js |   5 +
 ...when-using-file-watching-thats-on-inode.js |  20 ++
 ...e-occurs-when-file-is-still-on-the-disk.js |   3 +
 ...rectory-when-renaming-file-in-subfolder.js |  10 +
 ...ymlinks-to-folders-in-recursive-folders.js |   2 +
 ...hronous-watch-directory-renaming-a-file.js |  11 +
 ...ory-with-outDir-and-declaration-enabled.js |  10 +
 .../with-non-synchronous-watch-directory.js   |  25 ++
 ...lt-as-fixed-chunk-size-watch-file-works.js |   4 +
 .../using-fixed-chunk-size-polling.js         |   4 +
 ...eDirectories-option-extendedDiagnostics.js |   5 +
 ...-directory-watching-extendedDiagnostics.js |   4 +
 ...ption-with-recursive-directory-watching.js |   4 +
 .../with-excludeDirectories-option.js         |   5 +
 ...excludeFiles-option-extendedDiagnostics.js |   5 +
 .../watchOptions/with-excludeFiles-option.js  |   5 +
 210 files changed, 3471 insertions(+), 3 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 2b38e36f96af7..ae15b0d02b719 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1120,10 +1120,15 @@ namespace ts {
                         recursive,
                         inodeWatching ?
                             callbackChangingToMissingFileSystemEntry :
-                            callback
+                            (eventName, relativeFileName) => {
+
+                                sysLog(`sysLog:: watchPresentFileSystemEntry:: ${fileOrDirectory} ${entryKind} ${eventName}:: ${relativeFileName}`);
+                                callback(eventName, relativeFileName);
+                            }
                     );
                     // Watch the missing file or directory or error
                     presentWatcher.on("error", () => {
+                        sysLog(`sysLog:: watchPresentFileSystemEntry:: on Error ${fileOrDirectory} ${entryKind} rename, ""`);
                         callback("rename", "");
                         updateWatcher(watchMissingFileSystemEntry);
                     });
@@ -1140,7 +1145,11 @@ namespace ts {
             }
 
             function callbackChangingToMissingFileSystemEntry(event: "rename" | "change", relativeName: string | undefined) {
-                if (relativeName && endsWith(relativeName, "~")) relativeName = relativeName.slice(0, relativeName.length - 1);
+                sysLog(`sysLog:: callbackChangingToMissingFileSystemEntry:: ${fileOrDirectory} ${entryKind} ${event}:: ${relativeName} ${inodeWatching} ${lastDirectoryPart} ${lastDirectoryPartWithDirectorySeparator}`);
+                if (relativeName && endsWith(relativeName, "~")) {
+                    relativeName = relativeName.slice(0, relativeName.length - 1);
+                    sysLog(`sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to ${relativeName}`);
+                }
                 callback(event, relativeName);
                 // because relativeName is not guaranteed to be correct we need to check on each rename with few combinations
                 // Eg on ubuntu while watching app/node_modules the relativeName is "node_modules" which is neither relative nor full path
@@ -1164,7 +1173,10 @@ namespace ts {
             function watchPresentFileSystemEntryWithFsWatchFile(): FileWatcher {
                 return watchFile(
                     fileOrDirectory,
-                    createFileWatcherCallback(callback),
+                    createFileWatcherCallback((eventName, relativeFileName) => {
+                        sysLog(`sysLog:: watchPresentFileSystemEntryWithFsWatchFile:: ${fileOrDirectory} ${entryKind} ${eventName}:: ${relativeFileName}`);
+                        callback(eventName, relativeFileName);
+                    }),
                     fallbackPollingInterval,
                     fallbackOptions
                 );
@@ -1178,7 +1190,9 @@ namespace ts {
                 return watchFile(
                     fileOrDirectory,
                     (_fileName, eventKind) => {
+                        sysLog(`sysLog:: watchMissingFileSystemEntry:: ${fileOrDirectory} ${entryKind} ${_fileName}:: ${eventKind}`);
                         if (eventKind === FileWatcherEventKind.Created && fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                            sysLog(`sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher`);
                             callback("rename", "");
                             // Call the callback for current file or directory
                             // For now it could be callback for the inner directory creation,
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
index b36912f7aa3ec..7e24b0a5cde10 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
@@ -433,6 +433,8 @@ export function lastElementOf<T>(arr: T[]): T | undefined {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/demo/core 1 change:: utilities.ts
+
 >> Screen clear
 [12:01:07 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
index e8f43afdbba83..be98b50cfe64c 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
@@ -216,6 +216,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/demo/core 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
index 757edf9d88cf3..fc9e9b9d46051 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
@@ -278,6 +278,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
+
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
@@ -370,6 +372,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
+
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
@@ -414,6 +418,7 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.ts' does not e
 File '/user/username/projects/myproject/packages/pkg2/build/const.tsx' does not exist.
 File '/user/username/projects/myproject/packages/pkg2/build/const.d.ts' exist - use it as a name resolution result.
 ======== Module name './const.js' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/const.d.ts'. ========
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 [12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
index 6b9ecac620c8c..c288e686de02e 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
@@ -269,6 +269,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: package.json
+
 >> Screen clear
 [12:01:11 AM] File change detected. Starting incremental compilation...
 
@@ -389,6 +391,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: package.json
+
 >> Screen clear
 [12:01:18 AM] File change detected. Starting incremental compilation...
 
@@ -432,6 +436,7 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.d.cts' exist -
 File '/a/lib/package.json' does not exist.
 File '/a/package.json' does not exist.
 File '/package.json' does not exist.
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 [12:01:24 AM] Found 0 errors. Watching for file changes.
 
 
@@ -499,6 +504,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: package.json
+
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
@@ -623,6 +630,12 @@ export type { TheNum } from './const.cjs';
 //// [/user/username/projects/myproject/packages/pkg2/index.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: index.cts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: 
+
 >> Screen clear
 [12:01:39 AM] File change detected. Starting incremental compilation...
 
@@ -642,8 +655,16 @@ File '/user/username/projects/myproject/packages/pkg2/const.cts' exist - use it
 File '/a/lib/package.json' does not exist.
 File '/a/package.json' does not exist.
 File '/package.json' does not exist.
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: build/index.cjs
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: build/index.d.cts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/tsconfig.tsbuildinfo
 [12:01:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/packages/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/const.cjs
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/const.d.cts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/packages/pkg2/const.cts","/user/username/projects/myproject/packages/pkg2/index.cts"]
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
index 02b66ff4809e5..7f8216537386c 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
@@ -129,6 +129,8 @@ Input::
 //// [/user/username/projects/myproject/a.js] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
@@ -177,6 +179,8 @@ const x = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
@@ -184,6 +188,8 @@ Output::
 
 [12:00:44 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
index d2b736cdf81ce..1e6516c5fda81 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
@@ -81,6 +81,8 @@ Input::
 //// [/user/username/projects/myproject/a.js] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+
 >> Screen clear
 [12:00:31 AM] File change detected. Starting incremental compilation...
 
@@ -129,6 +131,8 @@ const x = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
index 45d8297c323a7..35395eee6a090 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
@@ -98,6 +98,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
@@ -157,6 +159,8 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
@@ -164,6 +168,24 @@ Output::
 
 [12:00:48 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
 [12:01:09 AM] Found 0 errors. Watching for file changes.
 
 
@@ -293,6 +315,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
@@ -305,6 +329,8 @@ Output::
 2 const a: string = 10;
         ~
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:22 AM] Found 1 error. Watching for file changes.
 
 
@@ -424,6 +450,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
 
@@ -481,6 +509,8 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
 
@@ -488,8 +518,13 @@ Output::
 
 [12:01:36 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:44 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -599,6 +634,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:52 AM] File change detected. Starting incremental compilation...
 
@@ -608,6 +645,10 @@ Output::
 
 [12:01:56 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:57 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
index c74f6d066f6ef..20b7ddc022482 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
@@ -98,6 +98,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
@@ -157,6 +159,8 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
@@ -164,6 +168,20 @@ Output::
 
 [12:00:48 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:05 AM] Found 0 errors. Watching for file changes.
 
 
@@ -236,6 +254,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
 
@@ -292,6 +312,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
@@ -349,6 +371,8 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
@@ -356,8 +380,11 @@ Output::
 
 [12:01:26 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:31 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
 [12:01:32 AM] Found 0 errors. Watching for file changes.
 
 
@@ -410,6 +437,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
@@ -419,6 +448,9 @@ Output::
 
 [12:01:40 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
 [12:01:41 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
index 9818a6cbf848d..64dfa065bf669 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
@@ -499,6 +499,8 @@ function someFn() { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -506,6 +508,11 @@ Output::
 
 [12:01:33 AM] Building project '/user/username/projects/sample1/logic/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:49 AM] Project 'sample1/tests/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:01:51 AM] Updating output timestamps of project '/user/username/projects/sample1/tests/tsconfig.json'...
@@ -660,6 +667,8 @@ export function someFn() { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
+
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
 
@@ -667,6 +676,11 @@ Output::
 
 [12:01:58 AM] Building project '/user/username/projects/sample1/logic/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:14 AM] Project 'sample1/tests/tsconfig.json' is out of date because oldest output 'sample1/tests/index.js' is older than newest input 'sample1/logic/tsconfig.json'
 
 [12:02:15 AM] Building project '/user/username/projects/sample1/tests/tsconfig.json'...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
index 191bed28c0501..8dc3cbee77b88 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
@@ -158,6 +158,8 @@ export var myClassWithError = class {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
@@ -209,6 +211,8 @@ export class myClass2 { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.ts
+
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
index b9b9221ded15b..fec6520daa708 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
@@ -158,6 +158,8 @@ export var myClassWithError = class {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
@@ -212,9 +214,17 @@ export var myClassWithError = class {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
+
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
index b5611cbdf261e..17cdd0f246f98 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
@@ -82,6 +82,8 @@ export class myClass2 { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.ts
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
index b95e38e00593a..68617fa5a81bb 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
@@ -85,9 +85,23 @@ export var myClassWithError = class {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithError.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithError.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithoutError.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithoutError.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
 [12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
index 0ec3a1c545cd5..2150943719b46 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
@@ -482,6 +482,8 @@ let y: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
+
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
@@ -490,6 +492,8 @@ Output::
 8 let y: string = 10;
       ~
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:31 AM] Found 1 error. Watching for file changes.
 
 
@@ -634,6 +638,8 @@ let x: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:35 AM] File change detected. Starting incremental compilation...
 
@@ -642,6 +648,8 @@ Output::
 5 let x: string = 10;
       ~
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 sample1/logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 8 let y: string = 10;
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
index 4ada4bc565f78..fe1de9ac155d1 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
@@ -481,6 +481,7 @@ let y: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
 sample1/logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
@@ -488,6 +489,8 @@ Output::
 8 let y: string = 10;
       ~
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:31 AM] Found 1 error. Watching for file changes.
 
 
@@ -632,6 +635,7 @@ let x: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
 [12:01:35 AM] File change detected. Starting incremental compilation...
 
 sample1/core/index.ts:5:5 - error TS2322: Type 'number' is not assignable to type 'string'.
@@ -639,6 +643,8 @@ Output::
 5 let x: string = 10;
       ~
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 sample1/logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 8 let y: string = 10;
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
index 826bc6fcd6615..2083cf6ee2fc9 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
@@ -178,6 +178,9 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
@@ -185,8 +188,18 @@ Output::
 
 [12:00:51 AM] Building project '/user/username/projects/sample1/core/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: outDir/file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: outDir/file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/tsconfig.tsbuildinfo
 [12:01:00 AM] Updating unchanged output timestamps of project '/user/username/projects/sample1/core/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
index 4f5076fc359ea..140331b70f444 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
@@ -193,6 +193,9 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
@@ -200,8 +203,22 @@ Output::
 
 [12:00:52 AM] Building project '/user/username/projects/sample1/core/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
 [12:01:03 AM] Updating unchanged output timestamps of project '/user/username/projects/sample1/core/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:07 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
index 9c056f5887166..ea3ed9e645707 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
@@ -221,6 +221,16 @@ Output::
 >> Screen clear
 [12:00:57 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
 
 
 Program root files: ["/user/username/projects/sample1/logic/index.ts"]
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
index 8ee1d321ec24f..e842fb4860564 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
@@ -181,9 +181,15 @@ export function createSomeObject(): SomeObject
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 App/app.ts:2:20 - error TS2551: Property 'message' does not exist on type 'SomeObject'. Did you mean 'message2'?
 
 2 createSomeObject().message;
@@ -322,9 +328,16 @@ export function createSomeObject(): SomeObject
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.ts
+
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/app 1 change:: app.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
index 5788471efc1e4..77ca2e55b4cb1 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
@@ -243,9 +243,16 @@ function myFunc() { return 10; }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/index.ts"]
@@ -346,6 +353,11 @@ Change:: Build logic
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.baseline.txt
 [12:01:25 AM] Found 0 errors. Watching for file changes.
 
 
@@ -495,9 +507,16 @@ function myFunc() { return 100; }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:29 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/index.ts"]
@@ -594,6 +613,11 @@ Change:: Build logic
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.baseline.txt
 [12:01:58 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index eb685e63ee0bc..a2b08a732c888 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -441,9 +441,22 @@ export const newFileConst = 30;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -558,6 +571,10 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:27 AM] Found 0 errors. Watching for file changes.
 
 
@@ -634,9 +651,19 @@ export class someClass2 { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -759,6 +786,10 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:47 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
index 345fc6474550c..9af35c779747f 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
@@ -445,9 +445,17 @@ export class someClass { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -565,6 +573,11 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:55 AM] Found 0 errors. Watching for file changes.
 
 
@@ -796,9 +809,17 @@ export function multiply(a: number, b: number) { return a * b; }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:59 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -908,6 +929,11 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1141,9 +1167,18 @@ export class someClass2 { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:02:47 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -1269,6 +1304,11 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:03:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
index b8e271ccd50fd..261f3c8c9663c 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -445,9 +445,21 @@ function foo() { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index a72f345ad4b19..24b29694504dc 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -475,9 +475,26 @@ export const newFileConst = 30;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+
 >> Screen clear
 [12:01:23 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -599,6 +616,10 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:39 AM] Found 0 errors. Watching for file changes.
 
 
@@ -675,9 +696,22 @@ export class someClass2 { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.ts
+
 >> Screen clear
 [12:01:43 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -807,6 +841,10 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:02:02 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
index 059ce163d3de5..cd2c46aa1f4b4 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
@@ -479,9 +479,19 @@ export class someClass { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -605,6 +615,11 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:08 AM] Found 0 errors. Watching for file changes.
 
 
@@ -836,9 +851,19 @@ export function multiply(a: number, b: number) { return a * b; }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:02:12 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -954,6 +979,11 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:56 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1187,9 +1217,20 @@ export class someClass2 { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:03:03 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -1321,6 +1362,11 @@ Change:: Build logic and tests
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:03:48 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
index f7f454b20cef9..89f79ea78be8f 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -479,9 +479,23 @@ function foo() { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
+
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
index 0b05490ab3eb6..381cecd6c305e 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
@@ -71,9 +71,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
index f39bf560fe98d..439f17cc559c9 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
@@ -405,6 +405,9 @@ Output::
 
 [12:01:19 AM] Building project '/a/b/project2.tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: other.js
 [12:01:29 AM] Found 0 errors. Watching for file changes.
 
 
@@ -477,6 +480,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: alpha.tsconfig.json
+
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
 
@@ -486,6 +491,11 @@ Output::
 
 [12:01:38 AM] Updating unchanged output timestamps of project '/a/b/project1.tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.d.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: project1.tsconfig.tsbuildinfo
 
 
 Program root files: ["/a/b/commonFile1.ts","/a/b/commonFile2.ts"]
@@ -544,6 +554,9 @@ Output::
 
 [12:01:42 AM] Updating unchanged output timestamps of project '/a/b/project2.tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: other.js
 [12:01:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
index 8dc08e6383227..6fd94479da3a3 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
@@ -1841,6 +1841,8 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:06:32 AM] File change detected. Starting incremental compilation...
 
@@ -1848,94 +1850,164 @@ Output::
 
 [12:06:34 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:06:47 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:49 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:06:50 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:06:53 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:55 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:06:56 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:58 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:06:59 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 [12:07:02 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:07:05 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:07 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:07:08 AM] Project 'pkg8/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:10 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:07:11 AM] Project 'pkg9/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:13 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:07:14 AM] Project 'pkg10/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:16 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 [12:07:17 AM] Project 'pkg11/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:19 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:07:20 AM] Project 'pkg12/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:22 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:07:23 AM] Project 'pkg13/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:25 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:07:26 AM] Project 'pkg14/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:28 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:07:29 AM] Project 'pkg15/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:31 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 [12:07:32 AM] Project 'pkg16/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:34 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: tsconfig.tsbuildinfo
 [12:07:35 AM] Project 'pkg17/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:37 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: tsconfig.tsbuildinfo
 [12:07:38 AM] Project 'pkg18/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:40 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: tsconfig.tsbuildinfo
 [12:07:41 AM] Project 'pkg19/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:43 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: tsconfig.tsbuildinfo
 [12:07:44 AM] Project 'pkg20/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:46 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: tsconfig.tsbuildinfo
 [12:07:47 AM] Project 'pkg21/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:49 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: tsconfig.tsbuildinfo
 [12:07:50 AM] Project 'pkg22/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: tsconfig.tsbuildinfo
 [12:07:53 AM] Found 0 errors. Watching for file changes.
 
 
@@ -2375,6 +2447,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:07:56 AM] File change detected. Starting incremental compilation...
 
@@ -2382,6 +2456,10 @@ Output::
 
 [12:07:58 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -2606,30 +2684,45 @@ Output::
 
 [12:08:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:08:15 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:16 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:08:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:08:19 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:20 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:08:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:08:23 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:24 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:08:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:08:27 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:28 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:08:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -2862,30 +2955,45 @@ Output::
 
 [12:08:34 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:08:35 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:36 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:08:38 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:08:39 AM] Project 'pkg8/tsconfig.json' is out of date because oldest output 'pkg8/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:40 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
 [12:08:42 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:08:43 AM] Project 'pkg9/tsconfig.json' is out of date because oldest output 'pkg9/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:44 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
 [12:08:46 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:08:47 AM] Project 'pkg10/tsconfig.json' is out of date because oldest output 'pkg10/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:48 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 [12:08:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg6/index.ts"]
@@ -3118,30 +3226,45 @@ Output::
 
 [12:08:54 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:08:55 AM] Project 'pkg12/tsconfig.json' is out of date because oldest output 'pkg12/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:56 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
 [12:08:58 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:08:59 AM] Project 'pkg13/tsconfig.json' is out of date because oldest output 'pkg13/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:00 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
 [12:09:02 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:09:03 AM] Project 'pkg14/tsconfig.json' is out of date because oldest output 'pkg14/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:04 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
 [12:09:06 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:09:07 AM] Project 'pkg15/tsconfig.json' is out of date because oldest output 'pkg15/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:08 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 [12:09:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg11/index.ts"]
@@ -3374,30 +3497,45 @@ Output::
 
 [12:09:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: tsconfig.tsbuildinfo
 [12:09:15 AM] Project 'pkg17/tsconfig.json' is out of date because oldest output 'pkg17/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:16 AM] Building project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
 [12:09:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: tsconfig.tsbuildinfo
 [12:09:19 AM] Project 'pkg18/tsconfig.json' is out of date because oldest output 'pkg18/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:20 AM] Building project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
 [12:09:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: tsconfig.tsbuildinfo
 [12:09:23 AM] Project 'pkg19/tsconfig.json' is out of date because oldest output 'pkg19/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:24 AM] Building project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
 [12:09:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: tsconfig.tsbuildinfo
 [12:09:27 AM] Project 'pkg20/tsconfig.json' is out of date because oldest output 'pkg20/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:28 AM] Building project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
 [12:09:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg16/index.ts"]
@@ -3630,12 +3768,18 @@ Output::
 
 [12:09:35 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: tsconfig.tsbuildinfo
 [12:09:36 AM] Project 'pkg22/tsconfig.json' is out of date because oldest output 'pkg22/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:37 AM] Building project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
 [12:09:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: tsconfig.tsbuildinfo
 [12:09:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -3980,6 +4124,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:09:43 AM] File change detected. Starting incremental compilation...
 
@@ -3987,6 +4133,10 @@ Output::
 
 [12:09:45 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -4213,30 +4363,45 @@ Output::
 
 [12:10:01 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:10:02 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:03 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:10:05 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:10:06 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:07 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:10:09 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:10:10 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:11 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:10:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:10:14 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:15 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:10:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -4469,30 +4634,45 @@ Output::
 
 [12:10:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:10:22 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:23 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:10:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:10:26 AM] Project 'pkg8/tsconfig.json' is out of date because oldest output 'pkg8/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:27 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
 [12:10:29 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:10:30 AM] Project 'pkg9/tsconfig.json' is out of date because oldest output 'pkg9/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:31 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
 [12:10:33 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:10:34 AM] Project 'pkg10/tsconfig.json' is out of date because oldest output 'pkg10/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:35 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 [12:10:37 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg6/index.ts"]
@@ -4722,6 +4902,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:10:40 AM] File change detected. Starting incremental compilation...
 
@@ -4729,46 +4911,80 @@ Output::
 
 [12:10:42 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:10:55 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:10:57 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:10:58 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:00 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:11:01 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:03 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:11:04 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:06 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:11:07 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:09 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 [12:11:10 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:12 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:11:13 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:15 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:11:16 AM] Project 'pkg8/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:18 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:11:19 AM] Project 'pkg9/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:21 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:11:22 AM] Project 'pkg10/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:24 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -5021,30 +5237,45 @@ Output::
 
 [12:11:28 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:11:29 AM] Project 'pkg12/tsconfig.json' is out of date because oldest output 'pkg12/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:30 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
 [12:11:32 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:11:33 AM] Project 'pkg13/tsconfig.json' is out of date because oldest output 'pkg13/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:34 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
 [12:11:36 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:11:37 AM] Project 'pkg14/tsconfig.json' is out of date because oldest output 'pkg14/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:38 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
 [12:11:40 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:11:41 AM] Project 'pkg15/tsconfig.json' is out of date because oldest output 'pkg15/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:42 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 [12:11:44 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg11/index.ts"]
@@ -5274,6 +5505,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:11:48 AM] File change detected. Starting incremental compilation...
 
@@ -5281,6 +5514,10 @@ Output::
 
 [12:11:50 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -5510,30 +5747,45 @@ Output::
 
 [12:12:06 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:12:07 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:08 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:12:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:12:11 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:12 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:12:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:12:15 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:16 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:12:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:12:19 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:20 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:12:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -5766,30 +6018,45 @@ Output::
 
 [12:12:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:12:27 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:28 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:12:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:12:31 AM] Project 'pkg8/tsconfig.json' is out of date because oldest output 'pkg8/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:32 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
 [12:12:34 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:12:35 AM] Project 'pkg9/tsconfig.json' is out of date because oldest output 'pkg9/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:36 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
 [12:12:38 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:12:39 AM] Project 'pkg10/tsconfig.json' is out of date because oldest output 'pkg10/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:40 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 [12:12:42 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg6/index.ts"]
@@ -6022,30 +6289,45 @@ Output::
 
 [12:12:46 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:12:47 AM] Project 'pkg12/tsconfig.json' is out of date because oldest output 'pkg12/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:48 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
 [12:12:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:12:51 AM] Project 'pkg13/tsconfig.json' is out of date because oldest output 'pkg13/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:52 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
 [12:12:54 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:12:55 AM] Project 'pkg14/tsconfig.json' is out of date because oldest output 'pkg14/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:56 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
 [12:12:58 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:12:59 AM] Project 'pkg15/tsconfig.json' is out of date because oldest output 'pkg15/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:00 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 [12:13:02 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg11/index.ts"]
@@ -6278,30 +6560,45 @@ Output::
 
 [12:13:06 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: tsconfig.tsbuildinfo
 [12:13:07 AM] Project 'pkg17/tsconfig.json' is out of date because oldest output 'pkg17/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:08 AM] Building project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
 [12:13:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: tsconfig.tsbuildinfo
 [12:13:11 AM] Project 'pkg18/tsconfig.json' is out of date because oldest output 'pkg18/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:12 AM] Building project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
 [12:13:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: tsconfig.tsbuildinfo
 [12:13:15 AM] Project 'pkg19/tsconfig.json' is out of date because oldest output 'pkg19/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:16 AM] Building project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
 [12:13:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: tsconfig.tsbuildinfo
 [12:13:19 AM] Project 'pkg20/tsconfig.json' is out of date because oldest output 'pkg20/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:20 AM] Building project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
 [12:13:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg16/index.ts"]
@@ -6534,12 +6831,18 @@ Output::
 
 [12:13:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: tsconfig.tsbuildinfo
 [12:13:27 AM] Project 'pkg22/tsconfig.json' is out of date because oldest output 'pkg22/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:28 AM] Building project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
 [12:13:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: tsconfig.tsbuildinfo
 [12:13:31 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
index 9d39f6ac125d3..ae086cd85a384 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
@@ -281,6 +281,8 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
 
@@ -288,14 +290,24 @@ Output::
 
 [12:01:14 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:27 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:01:29 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:01:30 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:01:32 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:01:33 AM] Found 0 errors. Watching for file changes.
 
 
@@ -435,6 +447,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
@@ -442,6 +456,10 @@ Output::
 
 [12:01:38 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -546,12 +564,18 @@ Output::
 
 [12:01:54 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:01:55 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:01:56 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:58 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:01:59 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
index 38b7bfc6373ef..6930e6d52487c 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
@@ -437,6 +437,8 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
@@ -444,22 +446,38 @@ Output::
 
 [12:01:46 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:59 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:02:02 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:02:05 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:07 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:02:08 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:10 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:02:11 AM] Found 0 errors. Watching for file changes.
 
 
@@ -629,6 +647,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:02:14 AM] File change detected. Starting incremental compilation...
 
@@ -636,6 +656,10 @@ Output::
 
 [12:02:16 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -752,24 +776,36 @@ Output::
 
 [12:02:32 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:02:33 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:02:34 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:02:36 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:02:37 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:02:38 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:02:40 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:02:41 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:02:42 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:02:44 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:02:45 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
index 51f3aaa618d33..367c9b6f5961d 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
@@ -671,6 +671,8 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:02:32 AM] File change detected. Starting incremental compilation...
 
@@ -678,34 +680,59 @@ Output::
 
 [12:02:34 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:47 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:49 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:02:50 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:02:53 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:55 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:02:56 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:58 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:02:59 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:03:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 [12:03:02 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:03:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:03:05 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:03:07 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:03:08 AM] Found 0 errors. Watching for file changes.
 
 
@@ -920,6 +947,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:03:11 AM] File change detected. Starting incremental compilation...
 
@@ -927,6 +956,10 @@ Output::
 
 [12:03:13 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -1061,30 +1094,45 @@ Output::
 
 [12:03:29 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:03:30 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:31 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:03:33 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:03:34 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:35 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:03:37 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:03:38 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:39 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:03:41 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:03:42 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:43 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:03:45 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -1227,12 +1275,18 @@ Output::
 
 [12:03:49 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:03:50 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:51 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:03:53 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:03:54 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1397,6 +1451,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:03:57 AM] File change detected. Starting incremental compilation...
 
@@ -1404,6 +1460,10 @@ Output::
 
 [12:03:59 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -1540,30 +1600,45 @@ Output::
 
 [12:04:16 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:04:17 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:18 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:04:20 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:04:21 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:22 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:04:24 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:04:25 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:26 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:04:28 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:04:29 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:30 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:04:32 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -1703,6 +1778,8 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
+
 >> Screen clear
 [12:04:35 AM] File change detected. Starting incremental compilation...
 
@@ -1710,26 +1787,45 @@ Output::
 
 [12:04:37 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:04:50 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:04:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:04:53 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:04:55 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:04:56 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:04:58 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:04:59 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:05:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:05:02 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:05:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -1877,12 +1973,18 @@ Output::
 
 [12:05:08 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:05:09 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:05:10 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:05:12 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:05:13 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
index 3458c8a45830f..96e1a7837424a 100644
--- a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
+++ b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
@@ -256,6 +256,8 @@ export function f2() { } // trailing
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: index.ts
+
 >> Screen clear
 [12:00:55 AM] File change detected. Starting incremental compilation...
 
@@ -263,12 +265,19 @@ Output::
 
 [12:00:57 AM] Building project '/user/username/projects/myproject/shared/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:10 AM] Project 'webpack/tsconfig.json' is out of date because oldest output 'webpack/index.js' is older than newest input 'shared/tsconfig.json'
 
 [12:01:11 AM] Building project '/user/username/projects/myproject/webpack/tsconfig.json'...
 
 [12:01:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/webpack/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/webpack 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/webpack 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/webpack 1 change:: tsconfig.tsbuildinfo
 [12:01:14 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
index ae54838ae4d6b..811a42de30c2e 100644
--- a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
+++ b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
@@ -264,6 +264,8 @@ export interface Session {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/reexport/src/pure 1 change:: session.ts
+
 >> Screen clear
 [12:01:07 AM] File change detected. Starting incremental compilation...
 
@@ -429,6 +431,8 @@ export interface Session {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/reexport/src/pure 1 change:: session.ts
+
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
index 9aebd0d53e615..db2348e0bb6b5 100644
--- a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
+++ b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
@@ -229,24 +229,28 @@ Output::
 
 [12:01:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:14 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:15 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:18 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:19 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:22 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:23 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:01:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -411,18 +415,21 @@ Output::
 
 [12:01:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:40 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:41 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:44 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:45 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
index ad4d9d4891d81..11ea03a188998 100644
--- a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
@@ -232,24 +232,28 @@ Output::
 
 [12:01:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:14 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:15 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:18 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:19 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:22 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:23 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:01:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -419,18 +423,21 @@ Output::
 
 [12:01:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:40 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:41 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:44 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:45 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
index b2c561112eb81..13eaa8fcc6a5b 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
@@ -71,8 +71,10 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: f.ts
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry::  1 change:: f.js
 [12:00:23 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
index b096bac970057..37dbaf9360641 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
@@ -70,8 +70,10 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: f.ts
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry::  1 change:: f.js
 [12:00:23 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
index 102a3122368ca..32537ebf8b9f1 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
@@ -75,9 +75,15 @@ var b = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 rename:: file.ts
+sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 rename:: file.ts
+sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 change:: 
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 change:: file.js
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
index 9567f0deb6e50..10c8410f08eef 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
@@ -109,9 +109,14 @@ export function Foo() { return 10; }export function foo2() { return 2; }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.ts
+
 >> Screen clear
 [12:00:29 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f3.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
@@ -178,9 +183,13 @@ export function Foo() { return 10; }export function foo2() { return 2; }export f
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f2.js
 [12:00:49 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
index 18c5c07ceb7cc..49c83ee1c7b6a 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
@@ -139,9 +139,12 @@ export var T: number;export function Foo() { };
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
 a/b/globalFile3.ts:1:1 - error TS1208: 'globalFile3.ts' cannot be compiled under '--isolatedModules' because it is considered a global script file. Add an import, export, or an empty 'export {}' statement to make it a module.
 
 1 interface GlobalFoo { age: number }
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
index 04f23c2aaa5a2..6c16f70ec573f 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
@@ -138,9 +138,12 @@ export var T: number;export function Foo() { };
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: out.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
index b5c71000f714a..c34cc2418dea2 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
@@ -135,9 +135,15 @@ export var T: number;export function Foo() { };
 //// [/a/b/file1Consumer2.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: file1Consumer2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
index f4707855b3345..fdf42df7712dc 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
@@ -137,9 +137,18 @@ import {Foo} from "./moduleFile1"; let y = Foo();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: file1Consumer3.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: file1Consumer3.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:00:52 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
index c11c863a1663d..351f027b7190b 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
@@ -134,9 +134,12 @@ export let y = Foo();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 a/b/file1Consumer1.ts:1:16 - error TS2304: Cannot find name 'Foo'.
 
 1 export let y = Foo();
@@ -205,9 +208,13 @@ export var T: number;export function Foo() { };
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
 a/b/file1Consumer1.ts:1:16 - error TS2304: Cannot find name 'Foo'.
 
 1 export let y = Foo();
@@ -281,9 +288,12 @@ import {Foo} from "./moduleFile1";let y = Foo();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
+
 >> Screen clear
 [12:00:57 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
@@ -347,9 +357,14 @@ export let y = Foo();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 a/b/file1Consumer1.ts:1:9 - error TS2305: Module '"./moduleFile1"' has no exported member 'Foo'.
 
 1 import {Foo} from "./moduleFile1";let y = Foo();
@@ -435,9 +450,15 @@ export var T: number;export function Foo() { };
 //// [/a/b/file1Consumer1.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:01:23 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:01:33 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
index 5e4bee56e5d58..66782a2e0b566 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
@@ -134,9 +134,14 @@ export var T: number;export function Foo() { };
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -208,9 +213,12 @@ export var T: number;export function Foo() { console.log('hi'); };
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
 a/b/moduleFile1.ts:1:46 - error TS2584: Cannot find name 'console'. Do you need to change your target library? Try changing the 'lib' compiler option to include 'dom'.
 
 1 export var T: number;export function Foo() { console.log('hi'); };
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
index cdbce1ebf488b..632852185fa0e 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
@@ -92,9 +92,12 @@ export var x = Foo();export var yy = Foo();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.ts
+
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.js
 a/b/referenceFile1.ts:1:22 - error TS6053: File '/a/b/moduleFile2.ts' not found.
 
 1 /// <reference path="./moduleFile2.ts" />
@@ -165,9 +168,15 @@ export var Foo4 = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.js
 a/b/referenceFile1.ts:2:16 - error TS2304: Cannot find name 'Foo'.
 
 2 export var x = Foo();export var yy = Foo();
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
index 9f19ac324e202..bc031dbd2623a 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
@@ -99,9 +99,13 @@ Input::
 //// [/a/b/moduleFile1.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.js
 a/b/referenceFile1.ts:1:22 - error TS6053: File '/a/b/moduleFile1.ts' not found.
 
 1 /// <reference path="./moduleFile1.ts" />
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
index dcabd0690ecbc..db1b85eef2955 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
@@ -134,9 +134,16 @@ interface GlobalFoo { age: number }var T2: string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: globalFile3.ts
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: globalFile3.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile2.js
 [12:00:53 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
index 46553cf38b57d..b3e5011bb110f 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
@@ -147,9 +147,13 @@ import {Foo} from "./moduleFile1"; export var y = 10;export var T: number;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1Consumer1.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -219,9 +223,14 @@ export var T: number;export function Foo() { };
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:01:02 AM] Found 0 errors. Watching for file changes.
 
 
@@ -299,9 +308,16 @@ import {Foo} from "./moduleFile1"; export var y = 10;export var T: number;export
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1Consumer1.js
 [12:01:21 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
index 7cd30bac07b7c..2737c00d55108 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
@@ -97,9 +97,13 @@ export var t1 = 10;export var t3 = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.ts
+
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file2.js
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
index 17fec0923ba94..3bf69033301de 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
@@ -86,9 +86,13 @@ let x = 11
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
+
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b.js
 [12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
@@ -144,9 +148,13 @@ let xy = 11
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b.js
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
index 422ae9350d56d..a3b210b6c55a7 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
@@ -77,9 +77,12 @@ let x = 11
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
+
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -130,9 +133,12 @@ let xy = 11
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
index dec712bb5bd5b..57728b97c5077 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
@@ -77,9 +77,12 @@ let x = 11
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
+
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -130,9 +133,12 @@ let xy = 11
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
index 59d6f8709809e..aa692ee55e945 100644
--- a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
+++ b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
@@ -86,6 +86,8 @@ var zz30 = 100;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/rootfolder/project/scripts 1 rename:: TypeScript.ts
+
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
index 588dd0314619b..4272cbcea36af 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,6 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
@@ -109,6 +111,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
@@ -169,6 +174,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
@@ -229,6 +237,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
index 3c4a303ac4d75..18518fb78ed74 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
@@ -134,9 +134,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -214,9 +219,13 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -291,9 +300,13 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
index f6870d4839f63..7c1d44cfc35a1 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,9 +184,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
 [12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
@@ -263,9 +270,13 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:04 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:11 AM] Found 0 errors. Watching for file changes.
 
 
@@ -333,9 +344,13 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:22 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index 1bf3370f68001..4e3a6ee79324b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -363,9 +381,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -373,6 +394,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -495,6 +517,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -552,11 +576,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -667,6 +696,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index 8f309c9a27f38..53d8f55173640 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -97,6 +97,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -156,9 +158,25 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
@@ -229,6 +247,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
@@ -285,6 +305,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -342,9 +364,12 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
@@ -399,6 +424,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 79e6631c3f518..9133600506473 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,6 +40,10 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -113,6 +117,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
@@ -173,6 +180,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
@@ -233,6 +243,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
index 373706d52b51b..66f8cda0d13a7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,9 +151,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:00:55 AM] Found 0 errors. Watching for file changes.
 
 
@@ -230,9 +236,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:59 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
@@ -309,9 +321,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index a56820f7ba866..212fde67d6fcf 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,9 +214,15 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -312,9 +318,15 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:11 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -410,9 +422,15 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index 7a3452236305e..1ed125b0faf66 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -174,6 +174,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -233,11 +235,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -379,9 +403,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -389,6 +416,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -512,6 +540,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -569,11 +599,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -686,6 +722,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index a660578a35d28..acd31dd9f41a7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -97,6 +97,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -156,9 +158,31 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
@@ -243,6 +267,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -299,6 +325,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
@@ -356,9 +384,13 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -414,6 +446,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
index 631343058a2df..a823ee84d13ec 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,6 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
@@ -109,6 +111,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
@@ -176,6 +181,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
@@ -238,6 +246,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
index ef905fec9f71d..80b3e7ab6f5b6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
@@ -134,9 +134,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -214,9 +219,13 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:00:57 AM] Found 0 errors. Watching for file changes.
 
 
@@ -288,9 +297,13 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
index ab0c14cc99bcc..7908db053821c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,9 +184,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
 [12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
@@ -263,9 +270,13 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:04 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -353,9 +364,13 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:22 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
index 388c3ea98bdb6..b0a79435ec614 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
@@ -178,6 +178,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -237,11 +239,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -367,9 +385,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -377,6 +398,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -498,6 +520,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -555,11 +579,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -669,6 +698,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
index 5b49bc9b5c4fd..f600fe003dd92 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
@@ -103,6 +103,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -162,9 +164,25 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
@@ -235,6 +253,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
@@ -291,6 +311,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -348,9 +370,12 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
@@ -405,6 +430,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
index 699571df19343..1c951a2e9282a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,6 +40,10 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -113,9 +117,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -181,9 +190,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
@@ -244,9 +258,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
index 1c4a21d2285bb..4193ca00dcef2 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,9 +151,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -238,9 +245,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:18 AM] Found 0 errors. Watching for file changes.
 
 
@@ -320,9 +334,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:22 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index c21f835e5b510..076f55957da12 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,9 +214,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:13 AM] Found 0 errors. Watching for file changes.
 
 
@@ -302,9 +310,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -406,9 +422,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:59 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
index 03fa4e8f54925..a9e15a098daa1 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -377,9 +401,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -387,6 +414,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -509,6 +537,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -566,11 +596,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -682,6 +718,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
index b3308300226e6..502b157b6c520 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
@@ -97,6 +97,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -156,9 +158,31 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
@@ -243,6 +267,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -299,6 +325,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
@@ -356,9 +384,13 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -414,6 +446,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
index 66f60506f1f5a..d5a6c8568da35 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,14 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -178,11 +184,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -307,11 +320,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -436,11 +456,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:02 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
index 1dd6ac58db846..a3606cfd1fe1c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
@@ -203,9 +203,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -213,6 +219,7 @@ Output::
 
 [12:00:53 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -361,9 +368,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -371,6 +383,7 @@ Output::
 
 [12:01:10 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -516,9 +529,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -526,6 +544,7 @@ Output::
 
 [12:01:27 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 1bcca5eaac7e8..9c299deb465c9 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -328,11 +328,20 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:07 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -503,11 +512,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:24 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -669,11 +684,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:41 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index ed442af297e49..49931f851f2e9 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -363,9 +381,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -373,6 +394,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -495,6 +517,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -552,11 +576,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -667,6 +696,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index 6d1212b6674c5..05db41a17298a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -363,9 +381,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -373,6 +394,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -495,6 +517,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -552,11 +576,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -667,6 +696,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
index df8601c2f13a0..9a9a3900fb9de 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,16 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -180,11 +188,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -307,11 +322,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:53 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -434,11 +456,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
index 3416312008eda..8ffe146b50c9c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -218,11 +218,19 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:02 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -364,11 +372,19 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:25 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -510,11 +526,19 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index ba092a2792a08..8dc8c3f723eef 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -356,9 +356,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -377,6 +384,7 @@ Output::
 
 [12:01:14 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -596,9 +604,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -617,6 +632,7 @@ Output::
 
 [12:01:37 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -836,9 +852,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -857,6 +880,7 @@ Output::
 
 [12:02:00 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index 6e2a98a4df712..04450f6526029 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -174,6 +174,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -233,11 +235,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -379,9 +403,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -389,6 +416,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -512,6 +540,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -569,11 +599,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -686,6 +722,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index 6ce359f78c7bf..c06900663a077 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -174,6 +174,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -233,11 +235,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -379,9 +403,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -389,6 +416,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -512,6 +540,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -569,11 +599,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -686,6 +722,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
index 4b76ba3f74523..a9adc01739724 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,14 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -175,9 +181,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -185,6 +196,8 @@ Output::
 
 [12:00:40 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -320,11 +333,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -448,9 +468,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -458,6 +483,8 @@ Output::
 
 [12:01:02 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
index 6b6265e4062da..14141643f1bbb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
@@ -200,9 +200,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -210,6 +216,7 @@ Output::
 
 [12:00:53 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -355,11 +362,17 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:10 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -495,9 +508,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -505,6 +523,7 @@ Output::
 
 [12:01:27 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 0bd997cf7d85b..6b17086fc49d7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -325,11 +325,20 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:07 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -497,9 +506,14 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -518,6 +532,7 @@ Output::
 
 [12:01:24 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -728,11 +743,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:41 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
index 194267bbfe50b..a8a79d5331b90 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
@@ -178,6 +178,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -237,11 +239,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -367,9 +385,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -377,6 +398,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -498,6 +520,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -555,11 +579,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -669,6 +698,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
index ce00016b8efec..5d757c9ff666b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
@@ -178,6 +178,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -237,11 +239,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -367,9 +385,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -377,6 +398,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -498,6 +520,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -555,11 +579,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -669,6 +698,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
index a8dc692ec8683..02a69a4b949ce 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,16 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -179,9 +187,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -189,6 +204,8 @@ Output::
 
 [12:00:45 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -325,11 +342,20 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -454,9 +480,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -464,6 +497,8 @@ Output::
 
 [12:01:13 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
index da962daca7abb..404c159553e53 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
@@ -217,9 +217,17 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -227,6 +235,7 @@ Output::
 
 [12:01:05 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -382,11 +391,20 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:31 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -530,9 +548,17 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -540,6 +566,7 @@ Output::
 
 [12:01:57 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 932f6e6d7b252..edfc5817c9add 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -355,11 +355,21 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -539,9 +549,18 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -560,6 +579,7 @@ Output::
 
 [12:01:49 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -784,11 +804,21 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:02:18 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
index d0a4d0f318392..9b8c6f9dae650 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -377,9 +401,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -387,6 +414,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -509,6 +537,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -566,11 +596,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -682,6 +718,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
index d8a4f56d04260..45751dc922034 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -377,9 +401,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -387,6 +414,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -509,6 +537,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -566,11 +596,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -682,6 +718,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
index 2fcab61a09b4e..415be8cbf8d7c 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,14 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -175,9 +181,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -185,6 +196,8 @@ Output::
 
 [12:00:40 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -320,11 +333,18 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -448,9 +468,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -458,6 +483,8 @@ Output::
 
 [12:01:02 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
index 26cd3ba63c1ae..84163b27c9ad1 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
@@ -200,9 +200,13 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -210,6 +214,7 @@ Output::
 
 [12:00:47 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -356,11 +361,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -495,9 +505,13 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -505,6 +519,7 @@ Output::
 
 [12:01:15 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 1ce4cd7ddf0e6..47e8cb014d611 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -325,11 +325,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:55 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -496,9 +501,13 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -517,6 +526,7 @@ Output::
 
 [12:01:09 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -728,11 +738,16 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:23 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
index 653445b31864a..5487cd16f8c0b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -172,6 +172,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -231,11 +233,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -361,9 +379,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -371,6 +392,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -492,6 +514,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -549,11 +573,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -663,6 +692,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
index 989ae3dbbb1ca..bdc2748c42373 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
@@ -172,6 +172,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -231,11 +233,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -361,9 +379,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -371,6 +392,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -492,6 +514,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -549,11 +573,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -663,6 +692,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
index acd5004cc0b66..787aa270209c2 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,16 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -179,9 +187,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -189,6 +204,8 @@ Output::
 
 [12:00:45 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -325,11 +342,20 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -454,9 +480,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -464,6 +497,8 @@ Output::
 
 [12:01:13 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
index b15e1527acddc..fbde7ff089812 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -217,9 +217,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -227,6 +234,7 @@ Output::
 
 [12:01:02 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -381,11 +389,19 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:25 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -528,9 +544,16 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -538,6 +561,7 @@ Output::
 
 [12:01:48 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index b635367da4bad..19a3b54610edd 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -355,11 +355,21 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -541,9 +551,18 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -562,6 +581,7 @@ Output::
 
 [12:01:49 AM] Found 2 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -788,11 +808,21 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:02:18 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index 8a2fffaedd3e0..adffac996df20 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -377,9 +401,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -387,6 +414,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -509,6 +537,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -566,11 +596,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -682,6 +718,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
index bed1bc6d9d617..39499bedd8dd7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -377,9 +401,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -387,6 +414,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -509,6 +537,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -566,11 +596,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -682,6 +718,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
index e10259bdb7999..4c9137b412ea7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,6 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
@@ -109,6 +111,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
@@ -176,6 +181,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
@@ -238,6 +246,9 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
index 77efd91c3c423..b13d120ad6507 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
@@ -134,9 +134,12 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -212,9 +215,12 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -285,9 +291,12 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 40a113914a8b5..23ec4494fa2f3 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,9 +184,12 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -259,9 +262,12 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -350,9 +356,12 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
index 2c894c145b09a..effe08a727e64 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -172,6 +172,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -231,11 +233,27 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -361,9 +379,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -371,6 +392,7 @@ Output::
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -492,6 +514,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -549,11 +573,16 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -663,6 +692,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
index a0bbf83e0dc85..00d9bfbcc6f31 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
@@ -97,6 +97,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -156,9 +158,25 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
@@ -229,6 +247,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
@@ -285,6 +305,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -342,9 +364,12 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
@@ -399,6 +424,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 618fe53144a13..fd82ee72294b1 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,6 +40,10 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -113,9 +117,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -181,9 +190,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
@@ -244,9 +258,14 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
index dd21b663f9d48..f802f56f1c48b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,9 +151,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -237,9 +243,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:00:59 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
@@ -318,9 +330,15 @@ export class C
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
+
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 08665de0850ed..9514448be65e7 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,9 +214,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:01:13 AM] Found 0 errors. Watching for file changes.
 
 
@@ -304,9 +312,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -410,9 +426,17 @@ export interface Coords {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:01:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:01:59 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index 9e681e6599665..53e409de7fde5 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -173,6 +173,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -232,11 +234,33 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -377,9 +401,12 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -387,6 +414,7 @@ Output::
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -509,6 +537,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -566,11 +596,17 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -682,6 +718,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
index 34f7d03b64896..66b5a94ca600a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
@@ -97,6 +97,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -156,9 +158,31 @@ const a = {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
@@ -243,6 +267,8 @@ const a: string = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -299,6 +325,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
@@ -356,9 +384,13 @@ const a: string = "hello";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -414,6 +446,8 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
+
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
index dec29649773ce..fd59c5990215f 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
@@ -115,9 +115,13 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.ts
+
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: b.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 project/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
index 4503d40a300d3..0b28da762ec06 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
@@ -115,9 +115,13 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.ts
+
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: b.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 project/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
index d2f27653bed2a..8fcebef95b7ab 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
@@ -143,9 +143,12 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
index 9670b01db257f..1cb178832b5ef 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
@@ -131,9 +131,13 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
index 9d715495c3c4a..77774ae652950 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
@@ -97,9 +97,12 @@ import { logger } from "./Logger"; new logger();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: another.ts
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: another.js
 user/username/projects/myproject/another.ts:1:24 - error TS1261: Already included file name '/user/username/projects/myproject/Logger.ts' differs from file name '/user/username/projects/myproject/logger.ts' only in casing.
   The file is in the program because:
     Imported via "./Logger" from file '/user/username/projects/myproject/another.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
index b34869681bb6c..cc3f543daafd8 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
@@ -143,9 +143,12 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
index 61a08b485eff8..d652c222335c8 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
@@ -131,9 +131,13 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
index e54490bf6694b..a03d7beee386a 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
@@ -149,9 +149,12 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 b.ts:2:19 - error TS2792: Cannot find module './yX/a'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 2 import { a } from "./yX/a";
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
index c42e49cc01c79..4e8d9102a6b0d 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
@@ -36,6 +36,12 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: XY.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: link.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 b.ts:2:19 - error TS2307: Cannot find module './yX' or its corresponding type declarations.
 
 2 import { a } from "./yX";
@@ -139,9 +145,14 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
 b.ts:2:19 - error TS2307: Cannot find module './yX' or its corresponding type declarations.
 
 2 import { a } from "./yX";
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
index 23a93128bab68..a7a3d48e40fc2 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
@@ -151,9 +151,12 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
   The file is in the program because:
     Imported via "./Xy/a" from file '/user/username/projects/myproject/b.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
index dd0ca380d9f3e..cc6ae7be49c20 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
@@ -139,9 +139,13 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 b.ts:2:19 - error TS1149: File name '/user/username/projects/myproject/Xy.ts' differs from already included file name '/user/username/projects/myproject/XY.ts' only in casing.
   The file is in the program because:
     Matched by default include pattern '**/*'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
index b80e2134bce4b..d4c7b75e3583c 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
@@ -151,9 +151,12 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
   The file is in the program because:
     Imported via "./Xy/a" from file '/user/username/projects/myproject/b.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
index c97de6ce4280b..0c6cbe0e17602 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
@@ -139,9 +139,13 @@ export const b = 2;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 b.ts:2:19 - error TS1149: File name '/user/username/projects/myproject/Xy.ts' differs from already included file name '/user/username/projects/myproject/XY.ts' only in casing.
   The file is in the program because:
     Matched by default include pattern '**/*'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
index 8478461feaac8..e696b1e3b441b 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
@@ -142,9 +142,12 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: moduleA.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: moduleA.js
 moduleA.ts:2:40 - error TS1261: Already included file name '/user/username/projects/myproject/ModuleC.ts' differs from file name '/user/username/projects/myproject/moduleC.ts' only in casing.
   The file is in the program because:
     Imported via "./ModuleC" from file '/user/username/projects/myproject/moduleA.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
index 92a7dcac194b7..ba1320e8cec68 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
@@ -95,6 +95,11 @@ Input::
 //// [/user/username/projects/myproject/Logger.ts] file was renamed from file /user/username/projects/myproject/logger.ts
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: logger.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: Logger.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
index f97d3a05fb12e..16fd7a70eb79d 100644
--- a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
@@ -32,6 +32,8 @@ Output::
 >> Screen clear
 [12:00:33 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /users/username/projects/project/src 1 rename:: index.js
+sysLog:: watchPresentFileSystemEntry:: /users/username/projects/project/src 1 change:: 
 [12:00:38 AM] Found 0 errors. Watching for file changes.
 
 
@@ -176,6 +178,7 @@ Output::
 >> Screen clear
 [12:00:44 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /users/username/projects/project/src 1 change:: index.js
 src/index.ts:1:51 - error TS2339: Property 'foo' does not exist on type 'Result'.
 
 1 import classNames from "classnames"; classNames().foo;
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
index 8ab4f71d85f61..c9009919cbd8d 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
@@ -153,6 +153,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
+
 >> Screen clear
 [12:00:53 AM] File change detected. Starting incremental compilation...
 
@@ -180,6 +182,7 @@ File '/user/username/projects/myproject/node_modules/pkg2/build/other.tsx' does
 File '/user/username/projects/myproject/node_modules/pkg2/build/other.d.ts' exist - use it as a name resolution result.
 Resolving real path for '/user/username/projects/myproject/node_modules/pkg2/build/other.d.ts', result '/user/username/projects/myproject/packages/pkg2/build/other.d.ts'.
 ======== Module name 'pkg2' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/other.d.ts' with Package ID 'pkg2/build/other.d.ts@1.0.0'. ========
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 packages/pkg1/index.ts:1:15 - error TS2305: Module '"pkg2"' has no exported member 'TheNum'.
 
 1 import type { TheNum } from 'pkg2'
@@ -285,6 +288,7 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.ts' does not e
 File '/user/username/projects/myproject/packages/pkg2/build/const.tsx' does not exist.
 File '/user/username/projects/myproject/packages/pkg2/build/const.d.ts' exist - use it as a name resolution result.
 ======== Module name './const.js' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/const.d.ts'. ========
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 [12:01:05 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js
index 5ec25f7fcfe83..0c1b4d730ed84 100644
--- a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
+++ b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
@@ -99,6 +99,8 @@ Thing.fn();
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /project 1 change:: src/index.ts
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
index 15a3e8bd3fa82..39756910bb7c8 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
@@ -101,6 +101,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
index 65462ae84baab..269eb38c46f33 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
@@ -78,6 +78,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
@@ -131,6 +133,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
index 4f47cd5f54f3c..30b1cb0e0312c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
@@ -72,6 +72,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
@@ -122,6 +124,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:23 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
index 22d57ffd06393..66d242d647884 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
@@ -74,9 +74,15 @@ let y = 1
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 [12:00:27 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
index 9be0097c5bedf..f5635e360db3c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
@@ -21,6 +21,8 @@ Output::
 >> Screen clear
 [12:00:13 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/file1.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
 a/b/file1.ts:1:20 - error TS2307: Cannot find module './moduleFile' or its corresponding type declarations.
 
 1 import * as T from "./moduleFile"; T.bar();
@@ -75,6 +77,9 @@ export function bar() { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/moduleFile.ts
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
+
 >> Screen clear
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
index 4ef78e41a9881..3d5c9ba773fd5 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
@@ -74,9 +74,15 @@ let y = 1
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: f2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: f2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
 [12:00:27 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
index 48b958db8510f..58860e5eb1776 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
@@ -79,9 +79,14 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 rename:: file2.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 change:: 
+
 >> Screen clear
 [12:00:29 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 rename:: file2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
index 1d1e3a97eda54..1875f9e0907dc 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
@@ -76,9 +76,12 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
 a/b/f1.ts:1:1 - error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
 
 1 export {}
diff --git a/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js b/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
index 8ce89bda343d1..9fcee78a9ddbd 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
@@ -84,6 +84,8 @@ Input::
 //// [/a/b/tsconfig.json] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
 error TS5083: Cannot read file '/a/b/tsconfig.json'.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
index c5b9c128afc0b..caef1045d34e2 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
@@ -83,9 +83,12 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /src 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /src 1 change:: app.js
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js b/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js
index 4cc9a64e0e993..9cd745bbb46b9 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js
@@ -153,9 +153,11 @@ export const z = 1;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: new-file.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 Reloading new file names and options
 Synchronizing program
 [12:00:39 AM] File change detected. Starting incremental compilation...
@@ -164,14 +166,20 @@ CreatingProgramWith::
   roots: ["/user/username/projects/myproject/f1.ts","/user/username/projects/myproject/f2.ts","/user/username/projects/myproject/new-file.ts"]
   options: {"composite":true,"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/new-file.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: new-file.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.js :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/new-file.js
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.js :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: new-file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected output file: /user/username/projects/myproject/new-file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:47 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/f1.ts","/user/username/projects/myproject/f2.ts","/user/username/projects/myproject/new-file.ts"]
@@ -281,14 +289,19 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/f1.ts 1:: WatchInfo: /user/username/projects/myproject/f1.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/f1.ts 1:: WatchInfo: /user/username/projects/myproject/f1.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: f1.ts
 Synchronizing program
 [12:00:53 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/f1.ts","/user/username/projects/myproject/f2.ts","/user/username/projects/myproject/new-file.ts"]
   options: {"composite":true,"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: f1.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: f1.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:03 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/f1.ts","/user/username/projects/myproject/f2.ts","/user/username/projects/myproject/new-file.ts"]
diff --git a/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
index c24a8fc88e321..d6c7a106c6db5 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
@@ -27,6 +27,8 @@ Output::
 >> Screen clear
 [12:00:17 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/c/app.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/c
 a/b/c/app.ts:2:25 - error TS2305: Module '"./module"' has no exported member 'f'.
 
 2                 import {f} from "./module"
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
index a10797617e9a4..0a759aac1e818 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
@@ -125,6 +125,7 @@ Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/f1.js
 a/b/f1.ts:1:15 - error TS7016: Could not find a declaration file for module './f2'. '/a/b/f2.js' implicitly has an 'any' type.
 
 1 export * from "./f2"
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
index 233d8635a3ebe..cdf207a5bbbed 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
@@ -125,6 +125,7 @@ Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/f1.js
 a/b/f1.ts:1:15 - error TS7016: Could not find a declaration file for module './f2'. '/a/b/f2.js' implicitly has an 'any' type.
 
 1 export * from "./f2"
diff --git a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
index 1dd28f2ed0021..c5357521539e3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
@@ -92,9 +92,13 @@ let y = 1;let xy = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.ts
+
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 a/b/commonFile1.ts
@@ -155,9 +159,13 @@ Input::
 //// [/a/b/commonFile2.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 a/b/commonFile1.ts
@@ -207,9 +215,14 @@ let y = 1
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 a/b/commonFile1.ts
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
index f44279fbd6495..72aa414b481b3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
@@ -96,9 +96,22 @@ export function bar() { };
 //// [/a/b/moduleFile.js] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
 a/b/file1.ts:1:20 - error TS2307: Cannot find module './moduleFile' or its corresponding type declarations.
 
 1 import * as T from "./moduleFile"; T.bar();
@@ -168,9 +181,21 @@ export function bar() { };
 //// [/a/b/moduleFile1.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
 [12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
index af64ecde0727f..31fbce47cdc2e 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
@@ -90,6 +90,7 @@ Output::
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/file1.js
 a/b/file1.ts:1:20 - error TS2307: Cannot find module './moduleFile' or its corresponding type declarations.
 
 1 import * as T from "./moduleFile"; T.bar();
@@ -137,6 +138,11 @@ export function bar() { };
 //// [/a/b/moduleFile1.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/moduleFile1.ts
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/moduleFile.ts
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
index 4166f16b7541b..134197ee82e55 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
@@ -97,9 +97,12 @@ import { x } from "../b";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: lib/a.js
 a.ts:3:19 - error TS6059: File '/user/username/projects/b.ts' is not under 'rootDir' '/user/username/projects/myproject'. 'rootDir' is expected to contain all source files.
 
 3 import { x } from "../b";
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
index ef020d04628d3..8a219eb58dac9 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
@@ -93,9 +93,12 @@ export const a: number = 1
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 b.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const b: string = a;
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
index e3fc789404c06..ea3e7d8a79e4b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
@@ -130,6 +130,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
@@ -262,9 +264,20 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: decls/src/file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: decls/src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
index 620c42fa2a32c..ffbe73076dae4 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
@@ -262,9 +262,18 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: build/src/file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: build/src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: decls/src/file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: decls/src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
index 6800711e1a42f..ac766fcc23d15 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
@@ -254,9 +254,16 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: build/src/file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: build/src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
index 7b96140fceb23..9bb0fde4fd3d9 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
@@ -249,9 +249,15 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: build/outFile.js
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
index 1b21f2ca83fcc..f63f2b5bcd268 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
@@ -130,6 +130,10 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
@@ -262,9 +266,22 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
index 1b80ab46e46ad..8aac3f60d10db 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
@@ -130,6 +130,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
@@ -254,9 +256,18 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
index f379dda653e4b..c61858b2e2a6c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
@@ -101,6 +101,7 @@ Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
index d6571f1f2e3e3..44fe5e4d0d401 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
@@ -112,6 +112,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:23 AM] File change detected. Starting incremental compilation...
 
@@ -166,9 +168,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry::  1 change:: b.js
+sysLog:: watchPresentFileSystemEntry::  1 change:: a.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
index b95366558d2e8..6e93c7990902a 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
@@ -86,9 +86,12 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:20 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry::  1 change:: a.js
 a.ts:2:21 - error TS2610: 'prop' is defined as an accessor in class 'C', but is overridden here in 'D' as an instance property.
 
 2 class D extends C { prop = 1; }
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
index d49eea56c629a..847c3c7b569e2 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
@@ -75,9 +75,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
index c29e44a58d755..0753cecb7b8ac 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
@@ -99,9 +99,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
@@ -152,9 +156,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 b.ts:1:1 - error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
 
 1 import {C} from './a';
@@ -218,9 +226,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
index 9412986369c3c..715cf188f0664 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
@@ -85,6 +85,8 @@ export default test;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
@@ -145,6 +147,8 @@ export default test;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
@@ -200,6 +204,8 @@ export default test;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
@@ -265,6 +271,8 @@ export default test;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
+
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
index ce71c8e888fa1..f67d6d31917e5 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
@@ -77,9 +77,15 @@ declare module 'a' {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 a.ts:2:8 - error TS2300: Duplicate identifier 'foo'.
 
 2   type foo = number;
@@ -153,9 +159,13 @@ Input::
 //// [/user/username/projects/myproject/b.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
index 2bbd474f5792b..a26275602e707 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
@@ -93,6 +93,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
index e8849a90830dc..d502751b50f3b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
@@ -88,6 +88,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
index 80b6a9c592175..81b8bb6b4644e 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
@@ -75,6 +75,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
@@ -127,6 +129,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
@@ -179,6 +183,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
index 410db4b1367bf..d37446191d686 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
@@ -27,6 +27,8 @@ Output::
 >> Screen clear
 [12:00:23 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 a.ts:1:23 - error TS2732: Cannot find module './data.json'. Consider using '--resolveJsonModule' to import module with '.json' extension.
 
 1 import * as data from './data.json'
@@ -87,9 +89,14 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js b/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
index 6cf84cd6877f2..37336d2bd5d0f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
@@ -75,9 +75,16 @@ var a = 10;
 //// [/home/username/project/src/file1.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 rename:: src/file1.ts
+sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 change:: src
+sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 rename:: src/file2.ts
+sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 change:: src
+
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 rename:: src/file2.js
+sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 change:: src
 [12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js b/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
index 2c6d1ff7e912d..baaba896465c3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
@@ -84,9 +84,11 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 Reloading new file names and options
 Synchronizing program
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
index 27c0214047124..7ff8a428bca12 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
@@ -112,9 +112,11 @@ import * as M from "folder1/module1";
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 rename:: module3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.ts :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.ts :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 change:: 
 Reloading new file names and options
 Synchronizing program
 [12:00:41 AM] File change detected. Starting incremental compilation...
@@ -123,9 +125,11 @@ CreatingProgramWith::
   roots: ["/user/username/projects/myproject/client/folder1/module1.ts","/user/username/projects/myproject/client/linktofolder2/module2.ts","/user/username/projects/myproject/client/linktofolder2/module3.ts"]
   options: {"baseUrl":"/user/username/projects/myproject/client","paths":{"*":["*"]},"pathsBasePath":"/user/username/projects/myproject","watch":true,"project":"/user/username/projects/myproject","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/client/linktofolder2/module3.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 rename:: module3.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.js :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/folder2/module3.js
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.js :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 change:: 
 [12:00:45 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
index 56df7dd17e823..88a0ed0a9447c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
@@ -168,9 +168,11 @@ class class3 {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 Reloading new file names and options
 [12:00:45 AM] File change detected. Starting incremental compilation...
@@ -248,9 +250,11 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
@@ -259,8 +263,12 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"watch":true,"project":"/user/username/projects/myproject/projects/project2/tsconfig.json","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -373,12 +381,16 @@ declare class file {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp/file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: temp
 
 
 WatchedFiles::
@@ -421,9 +433,11 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -433,6 +447,9 @@ CreatingProgramWith::
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 error TS6053: File '/user/username/projects/myproject/projects/project1/class3.d.ts' not found.
   The file is in the program because:
     Output from referenced project '/user/username/projects/myproject/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
@@ -444,6 +461,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
 
 [12:01:18 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -547,9 +565,11 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -558,8 +578,12 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"watch":true,"project":"/user/username/projects/myproject/projects/project2/tsconfig.json","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:01:35 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
index 4b564de1611fd..4ae590d53c6a5 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
@@ -103,6 +103,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
@@ -158,6 +160,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
@@ -218,6 +222,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
@@ -282,6 +288,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
@@ -341,6 +349,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:51 AM] File change detected. Starting incremental compilation...
 
@@ -396,6 +406,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
+
 >> Screen clear
 [12:00:56 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
index 82a4e297d8331..8116d53563f09 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
@@ -536,6 +536,13 @@ function foo() { }
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
 
@@ -718,6 +725,13 @@ export declare function gfoo(): void;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+
 >> Screen clear
 [12:01:51 AM] File change detected. Starting incremental compilation...
 
@@ -977,6 +991,15 @@ export declare function gfoo(): void;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: decls
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: decls/index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: decls
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+
 >> Screen clear
 [12:02:22 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
index f78e22fda1784..7828d8cdf1a5c 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
@@ -346,9 +346,21 @@ export declare function gfoo(): void;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
 
@@ -446,9 +458,15 @@ export class A {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 rename:: nrefs
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: nrefs
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: tsconfig.json
+
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:01:32 AM] Found 0 errors. Watching for file changes.
 
 
@@ -545,9 +563,12 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: tsconfig.json
+
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:01:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -644,6 +665,9 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
@@ -739,6 +763,9 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:01:50 AM] File change detected. Starting incremental compilation...
 
@@ -821,9 +848,17 @@ Input::
 //// [/user/username/projects/transitiveReferences/b/tsconfig.json] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 c/tsconfig.json:1:84 - error TS6053: File '/user/username/projects/transitiveReferences/b' not found.
 
 1 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"references":[{"path":"../b"}]}
@@ -909,9 +944,14 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
+
 >> Screen clear
 [12:02:03 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:02:07 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1006,9 +1046,16 @@ Input::
 //// [/user/username/projects/transitiveReferences/a/tsconfig.json] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/a 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/a 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
+
 >> Screen clear
 [12:02:09 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: index.js
 b/tsconfig.json:1:96 - error TS6053: File '/user/username/projects/transitiveReferences/a' not found.
 
 1 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"references":[{"path":"../a"}]}
@@ -1105,6 +1152,10 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
+
 >> Screen clear
 [12:02:17 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
index 1deb26f2868c5..82edc629807b8 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
@@ -342,6 +342,12 @@ export declare function gfoo(): void;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
+
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
@@ -438,6 +444,10 @@ export class A {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 rename:: nrefs
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: nrefs
+
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
@@ -628,6 +638,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
@@ -718,6 +730,8 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
+
 >> Screen clear
 [12:01:50 AM] File change detected. Starting incremental compilation...
 
@@ -795,9 +809,14 @@ Input::
 //// [/user/username/projects/transitiveReferences/b/tsconfig.json] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
+
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
 c/tsconfig.json:1:105 - error TS6053: File '/user/username/projects/transitiveReferences/b' not found.
 
 1 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"files":["index.ts"],"references":[{"path":"../b"}]}
@@ -881,6 +900,10 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
+
 >> Screen clear
 [12:02:03 AM] File change detected. Starting incremental compilation...
 
@@ -974,9 +997,14 @@ Input::
 //// [/user/username/projects/transitiveReferences/a/tsconfig.json] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
+
 >> Screen clear
 [12:02:09 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: index.js
 b/tsconfig.json:1:117 - error TS6053: File '/user/username/projects/transitiveReferences/a' not found.
 
 1 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"files":["index.ts"],"references":[{"path":"../a"}]}
@@ -1070,6 +1098,10 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
+
 >> Screen clear
 [12:02:17 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
index ec5ba33068815..5a8350b7b0b53 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
@@ -24,6 +24,10 @@ Output::
 >> Screen clear
 [12:00:15 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: f1.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: d/f0.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d
 a/d/f0.ts:1:17 - error TS2306: File '/a/f1.ts' is not a module.
 
 1 import {x} from "f1"
@@ -93,9 +97,12 @@ import {x} from "f1"
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.ts
+
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.js
 a/d/f0.ts:1:17 - error TS2306: File '/a/f1.ts' is not a module.
 
 1 import {x} from "f1"
@@ -162,9 +169,12 @@ import {x} from "f2"
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.ts
+
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.js
 a/d/f0.ts:1:17 - error TS2792: Cannot find module 'f2'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 1 import {x} from "f2"
@@ -221,9 +231,13 @@ import {x} from "f1"
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.ts
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: f1.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.js
 a/d/f0.ts:1:17 - error TS2306: File '/a/f1.ts' is not a module.
 
 1 import {x} from "f1"
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
index 4983e21f361fc..8711b2767ab29 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
@@ -87,6 +87,19 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: .cache
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/.cache
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: .cache/babel-loader
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/.cache/babel-loader
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: .cache
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/.cache
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: .cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: .cache/babel-loader
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/.cache/babel-loader
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
index 85f14d17a90e3..25ea2f7ce25cd 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
@@ -27,6 +27,8 @@ Output::
 >> Screen clear
 [12:00:27 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/test.js
+sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -81,6 +83,13 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/node_modules/.cache
+sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject/node_modules
+sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/node_modules/.cache/babel-loader
+sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject/node_modules/.cache
+sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts
+sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject/node_modules/.cache/babel-loader
+
 
 WatchedFiles::
 /user/username/projects/myproject/test.ts:
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
index fe2afcf3739ba..26781409f1eb0 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
@@ -21,6 +21,9 @@ Output::
 >> Screen clear
 [12:00:11 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: foo.js
+sysLog:: watchPresentFileSystemEntry::  1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
 a/foo.ts:1:17 - error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 1 import {x} from "bar"
@@ -82,9 +85,15 @@ export const y = 1;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.ts
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: bar.d.ts
+sysLog:: watchPresentFileSystemEntry::  1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
+
 >> Screen clear
 [12:00:20 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.js
 [12:00:24 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
index a7a69e9bbf8fb..c76354103ea07 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
@@ -24,6 +24,8 @@ Output::
 >> Screen clear
 [12:00:13 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: foo.js
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
 [12:00:16 AM] Found 0 errors. Watching for file changes.
 
 
@@ -76,9 +78,13 @@ Input::
 //// [/a/bar.d.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: bar.d.ts
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
+
 >> Screen clear
 [12:00:18 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.js
 a/foo.ts:1:17 - error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 1 import {x} from "bar"
@@ -129,9 +135,14 @@ export const y = 1;export const x = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: bar.d.ts
+sysLog:: watchPresentFileSystemEntry::  1 change:: a
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
+
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.js
 [12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
index e1320878fe8ab..e967c45ba9ff9 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
@@ -87,11 +87,37 @@ declare namespace myapp {
 
 
 Output::
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/node_modules 1 /user/username/projects/myproject/node_modules:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types/package.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types/package.json
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp/ts-types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp/ts-types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp/ts-types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp/ts-types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types/types/somefile.define.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types/types/somefile.define.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp/ts-types/types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp/ts-types/types
 
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: lib/app.js
 [12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
index 4f41981f7b4e6..5692c7f704e20 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
@@ -138,83 +138,124 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/base.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/base.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/globals.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/globals.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/globals.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/index.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/index.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/ts3.6/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/ts3.6/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/ts3.6/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node/ts3.6
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node/ts3.6
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node/ts3.6
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/node_modules/@types/node/ts3.6
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: 
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
 Reloading new file names and options
 Synchronizing program
 [12:00:48 AM] File change detected. Starting incremental compilation...
@@ -227,6 +268,7 @@ FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/base.d.ts 250 undefined Source file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/index.d.ts 250 undefined Source file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/package.json 2000 undefined package.json file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: worker.js
 worker.ts:1:1 - error TS2580: Cannot find name 'process'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`.
 
 1 process.on("uncaughtException");
@@ -280,36 +322,53 @@ export const foo = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: 
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: mocha
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/mocha
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/mocha
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: mocha/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/mocha/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/mocha/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: mocha
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/mocha
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/mocha
 Reloading new file names and options
 Synchronizing program
 [12:00:59 AM] File change detected. Starting incremental compilation...
@@ -372,16 +431,22 @@ Change:: npm ci step three: create atTypes node folder
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types
 Reloading new file names and options
 Synchronizing program
 [12:01:03 AM] File change detected. Starting incremental compilation...
@@ -462,24 +527,36 @@ declare namespace NodeJS {
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/node_modules/@types/node/ts3.6
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 Scheduling update
 Reloading new file names and options
 Synchronizing program
@@ -493,6 +570,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 250 undefined Source file
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 250 undefined Source file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/node/package.json 2000 undefined package.json file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: worker.js
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
index 8dea1d815e32b..66f5bb5c292a2 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
@@ -87,8 +87,28 @@ declare module "fs" {
 
 
 Output::
+sysLog:: watchMissingFileSystemEntry:: /a/b/node_modules 1 /a/b/node_modules:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /a/b/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: 
+sysLog:: watchMissingFileSystemEntry:: /a/b/node_modules/@types 1 /a/b/node_modules/@types:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /a/b/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: node
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: @types
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: node/package.json
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types/node/package.json
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: @types/node
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: node/index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types/node/index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 change:: node
+sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: @types/node
 
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
index 682abdee15795..4d3c1fce6dee6 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
@@ -79,8 +79,19 @@ export {}
 //// [/user/username/projects/myproject/node_modules2/@types/qqq/index.d.ts] deleted
 
 Output::
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/node_modules 1 /user/username/projects/myproject/node_modules:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 /user/username/projects/myproject/node_modules/@types:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /user/username/projects/myproject/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: qqq
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/qqq
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: qqq/index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/qqq/index.d.ts
 
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
index 57076cf6e3a80..89d98c62aeb81 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
@@ -112,6 +112,8 @@ module1("hello");
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b/projects/myproject/src 1 change:: file1.ts
+
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js b/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
index 059b90a59d1d9..725e197cdc986 100644
--- a/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
+++ b/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
@@ -85,9 +85,14 @@ Input::
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: other2.vue
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+
 >> Screen clear
 [12:00:31 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: other2.vue.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
index 7f5292f597fa5..83286fc8537e3 100644
--- a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
+++ b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
@@ -79,6 +79,8 @@ export const x = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: main.ts
+
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
index 96a7d413c8cba..765829369f0c3 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
@@ -168,9 +168,11 @@ class class3 {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 Loading config file: /user/username/projects/myproject/projects/project1/tsconfig.json
 [12:00:45 AM] File change detected. Starting incremental compilation...
@@ -248,9 +250,11 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
@@ -259,8 +263,12 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -373,12 +381,16 @@ declare class file {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp/file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: temp
 
 
 WatchedFiles::
@@ -421,9 +433,11 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -433,6 +447,9 @@ CreatingProgramWith::
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 error TS6053: File '/user/username/projects/myproject/projects/project1/class3.d.ts' not found.
   The file is in the program because:
     Output from referenced project '/user/username/projects/myproject/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
@@ -444,6 +461,7 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/proj
 
 [12:01:18 AM] Found 1 error. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -547,9 +565,11 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -558,8 +578,12 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:01:35 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
index 83f887411c96f..7b25ba1e0ca65 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
@@ -168,9 +168,11 @@ class class3 {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 Loading config file: /user/username/projects/myproject/projects/project1/tsconfig.json
 [12:00:45 AM] File change detected. Starting incremental compilation...
@@ -180,8 +182,12 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.ts 250 undefined Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:00:55 AM] Found 0 errors. Watching for file changes.
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -294,12 +300,16 @@ declare class file {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp/file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: temp
 
 
 WatchedFiles::
@@ -341,9 +351,11 @@ declare class class3 {}
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 
 
 WatchedFiles::
diff --git a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
index 4c5a5c4a2a475..995a6339443b7 100644
--- a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
+++ b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
@@ -74,6 +74,11 @@ const y =10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: bar.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: bar.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
index 534e0e7161485..b55a99c657475 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
@@ -39,8 +39,10 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 {"watchFile":4} Source file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: main.js true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -99,30 +101,45 @@ export function foo2(): string;
 
 
 Output::
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename:: foo.d.ts~ true foo.d.ts /foo.d.ts
+sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts~ true myproject /myproject
+sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: myproject~ true myproject /myproject
+sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to myproject
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 /user/username/projects/myproject/foo.d.ts:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename:: foo.d.ts~ true foo.d.ts /foo.d.ts
+sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts~ true myproject /myproject
+sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: myproject~ true myproject /myproject
+sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to myproject
 Synchronizing program
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js true myproject /myproject
 main.ts:1:10 - error TS2724: '"./foo"' has no exported member named 'foo'. Did you mean 'foo2'?
 
 1 import { foo } from "./foo"; foo();
@@ -183,30 +200,45 @@ export function foo(): string;
 
 
 Output::
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename:: foo.d.ts~ true foo.d.ts /foo.d.ts
+sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts~ true myproject /myproject
+sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: myproject~ true myproject /myproject
+sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to myproject
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 /user/username/projects/myproject/foo.d.ts:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename:: foo.d.ts~ true foo.d.ts /foo.d.ts
+sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts~ true myproject /myproject
+sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: myproject~ true myproject /myproject
+sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to myproject
 Synchronizing program
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js true myproject /myproject
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
index c4141fa5d0453..6713120866d4b 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -98,6 +98,7 @@ export declare function foo2(): string;
 
 
 Output::
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename::  true foo.ts /foo.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
@@ -167,14 +168,18 @@ export declare function foo(): string;
 
 
 Output::
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename::  true foo.ts /foo.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.ts:: Changing watcher to MissingFileSystemEntryWatcher
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 /user/username/projects/myproject/foo.ts:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename::  true foo.ts /foo.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
index 534e0e7161485..70cfa01d2725e 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
@@ -39,8 +39,10 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 {"watchFile":4} Source file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: main.js true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -99,30 +101,39 @@ export function foo2(): string;
 
 
 Output::
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 /user/username/projects/myproject/foo.d.ts:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 Synchronizing program
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js true myproject /myproject
 main.ts:1:10 - error TS2724: '"./foo"' has no exported member named 'foo'. Did you mean 'foo2'?
 
 1 import { foo } from "./foo"; foo();
@@ -183,30 +194,39 @@ export function foo(): string;
 
 
 Output::
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
+sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 /user/username/projects/myproject/foo.d.ts:: 0
+sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 Synchronizing program
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
+sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js true myproject /myproject
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
index 129e3ec2f790a..56bf549b473a1 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -98,6 +98,7 @@ export declare function foo2(): string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename:: 
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
@@ -166,9 +167,11 @@ export declare function foo(): string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename:: 
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename:: 
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
index 3e010dd8582e3..559a7dba4e83f 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
@@ -76,9 +76,19 @@ Input::
 //// [/a/username/project/src/file1.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 rename:: file1.ts
+sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/username/project 1 change:: src
+sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 rename:: file2.ts
+sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/username/project 1 change:: src
+
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 rename:: file2.js
+sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /a/username/project 1 change:: src
 [12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
index 571d2cfcb72c0..71b85643f6825 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
@@ -62,6 +62,8 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myprojec
 FileWatcher:: Added:: WatchInfo: /home/user/projects/myproject/node_modules/reala/package.json 2000 undefined package.json file
 DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject/node_modules/@types 1 undefined Type roots
+sysLog:: watchPresentFileSystemEntry:: /home/user/projects/myproject/src 1 rename:: file.js
+sysLog:: watchPresentFileSystemEntry:: /home/user/projects/myproject/src 1 change:: 
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 undefined Wild card directory
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
index 5f9740db448a6..9c8046450650b 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
@@ -126,9 +126,17 @@ export const x = 10;
 //// [/user/username/projects/myproject/src/file2.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: renamed.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: file1.js
 error TS6053: File '/user/username/projects/myproject/src/file2.ts' not found.
   The file is in the program because:
     Matched by default include pattern '**/*'
@@ -184,6 +192,9 @@ Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 rename:: renamed.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: dist
 user/username/projects/myproject/src/file1.ts:1:19 - error TS2307: Cannot find module './file2' or its corresponding type declarations.
 
 1 import { x } from "./file2";
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
index 59faa168aad77..df4cbd683cf3e 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
@@ -134,6 +134,10 @@ export const y = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -174,6 +178,12 @@ Output::
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 rename:: file3.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: dist
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 rename:: file3.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: dist
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
index ae378d1bdd38e..58e1a7dd71c2f 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
@@ -27,6 +27,8 @@ Output::
 >> Screen clear
 [12:00:29 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file1.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
@@ -124,9 +126,21 @@ Input::
 //// [/user/username/projects/myproject/node_modules/file2/index.d.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/file2 1 rename:: index.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/file2 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: file2
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/file2 1 rename:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: file2
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: file1.js
 user/username/projects/myproject/src/file1.ts:1:19 - error TS2307: Cannot find module 'file2' or its corresponding type declarations.
 
 1 import { x } from "file2";
@@ -229,6 +243,10 @@ Change:: Start npm install
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -258,6 +276,10 @@ Change:: npm install folder creation of file2
 Input::
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: file2
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -290,6 +312,8 @@ export const x = 10;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: file2
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -384,6 +408,7 @@ Output::
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: file1.js
 [12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
index 48df9d0d09b1d..ee3b0cb995f2d 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
@@ -78,6 +78,8 @@ var zz30 = 100;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.ts
+
 
 WatchedFiles::
 /a/b/node_modules/@types:
@@ -100,6 +102,8 @@ Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
 [12:00:33 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
index 37d63eb42a659..25f4f1161f65f 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
@@ -97,6 +97,8 @@ var zz30 = 100;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.ts
+
 
 WatchedFiles::
 /a/b/node_modules/@types:
@@ -119,6 +121,8 @@ Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
+sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
index 8a4d9817b7fc4..ff40d55d26c25 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
@@ -50,8 +50,10 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Failed Lookup Locations
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/bar/package.json 2000 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} package.json file
 ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Wild card directory
@@ -117,6 +119,9 @@ Input::
 //// [/user/username/projects/myproject/node_modules/bar/fooBar.d.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/bar/fooBar.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
index 17445c13fa132..ecbbd881cd06e 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
@@ -52,6 +52,8 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/bar/package.json 2000 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} package.json file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Wild card directory
@@ -171,6 +173,8 @@ export function temp(): string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/bar 1 change:: temp
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
index d633c62afa8a6..396906bdcf693 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
@@ -36,6 +36,8 @@ Output::
 >> Screen clear
 [12:00:37 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -144,6 +146,8 @@ export function temp(): string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/bar 1 change:: temp
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
index 77eb64d93475c..ca464f91011d0 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
@@ -36,6 +36,8 @@ Output::
 >> Screen clear
 [12:00:37 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -99,6 +101,9 @@ Input::
 //// [/user/username/projects/myproject/node_modules/bar/fooBar.d.ts] deleted
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/bar/fooBar.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
index 88d25cde1fcc5..75ef71c5a1607 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
@@ -52,8 +52,10 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/bar/package.json 2000 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} package.json file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Type roots
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Failed Lookup Locations
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Wild card directory
@@ -119,6 +121,9 @@ export function fooBar(): string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: bar/foo.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar/foo.d.ts
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
index 54ce05a590cbf..e516101ea4f18 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
@@ -36,6 +36,8 @@ Output::
 >> Screen clear
 [12:00:37 AM] Starting compilation in watch mode...
 
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -99,6 +101,9 @@ export function fooBar(): string;
 
 
 Output::
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: bar/foo.d.ts
+sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar/foo.d.ts
+
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:

From 8cd3af83ef94325c4282bf19c257c542c064fef3 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 31 May 2022 10:23:02 -0700
Subject: [PATCH 14/15] Revert "Some logging for debugging further"

This reverts commit e1ba8a8d5f2f30cc039a89a1e8e4e6c64ba7c44d.
---
 src/compiler/sys.ts                           |  20 +-
 .../demo/updates-with-bad-reference.js        |   2 -
 .../demo/updates-with-circular-reference.js   |   2 -
 ...for-changes-to-package-json-main-fields.js |   5 -
 ...t-correctly-with-cts-and-mts-extensions.js |  21 --
 ...n-no-files-are-emitted-with-incremental.js |   6 -
 ...when-watching-when-no-files-are-emitted.js |   4 -
 ...mit-any-files-on-error-with-incremental.js |  41 ---
 .../does-not-emit-any-files-on-error.js       |  32 --
 .../incremental-updates-in-verbose-mode.js    |  14 -
 .../when-file-with-no-error-changes.js        |   4 -
 ...ing-errors-only-changed-file-is-emitted.js |  10 -
 .../when-file-with-no-error-changes.js        |   2 -
 ...ixing-error-files-all-files-are-emitted.js |  14 -
 .../when-preserveWatchOutput-is-not-used.js   |   8 -
 ...veWatchOutput-is-passed-on-command-line.js |   6 -
 ...e-of-program-emit-with-outDir-specified.js |  13 -
 ...r-recompilation-because-of-program-emit.js |  17 -
 ...tches-config-files-that-are-not-present.js |  10 -
 ...e-down-stream-project-and-then-fixes-it.js |  13 -
 ...ncing-project-even-for-non-local-change.js |  24 --
 ...le-is-added,-and-its-subsequent-updates.js |  31 --
 ...hanges-and-reports-found-errors-message.js |  40 ---
 ...not-start-build-of-referencing-projects.js |  12 -
 ...le-is-added,-and-its-subsequent-updates.js |  38 ---
 ...hanges-and-reports-found-errors-message.js |  46 ---
 ...not-start-build-of-referencing-projects.js |  14 -
 ...hen-noUnusedParameters-changes-to-false.js |   4 -
 .../works-with-extended-source-files.js       |  13 -
 ...hen-there-are-23-projects-in-a-solution.js | 303 ------------------
 ...when-there-are-3-projects-in-a-solution.js |  24 --
 ...when-there-are-5-projects-in-a-solution.js |  36 ---
 ...when-there-are-8-projects-in-a-solution.js | 102 ------
 .../publicApi/with-custom-transformers.js     |   9 -
 .../reexport/Reports-errors-correctly.js      |   4 -
 ...e-projects-with-single-watcher-per-file.js |   7 -
 .../same-file-in-multiple-projects.js         |   7 -
 .../createWatchOfConfigFile.js                |   2 -
 ...Result-on-WatchCompilerHostOfConfigFile.js |   2 -
 ...s-deleted-and-created-as-part-of-change.js |   6 -
 .../should-emit-specified-file.js             |   9 -
 ...elf-if-'--isolatedModules'-is-specified.js |   3 -
 ...-if-'--out'-or-'--outFile'-is-specified.js |   3 -
 ...should-be-up-to-date-with-deleted-files.js |   6 -
 ...-be-up-to-date-with-newly-created-files.js |   9 -
 ...-to-date-with-the-reference-map-changes.js |  21 --
 ...les-referencing-it-if-its-shape-changed.js |   8 -
 .../should-detect-non-existing-code-file.js   |   9 -
 .../should-detect-removed-code-file.js        |   4 -
 ...ll-files-if-a-global-file-changed-shape.js |   7 -
 ...ould-return-cascaded-affected-file-list.js |  16 -
 ...fine-for-files-with-circular-references.js |   4 -
 .../config-does-not-have-out-or-outFile.js    |   8 -
 .../config-has-out.js                         |   6 -
 .../config-has-outFile.js                     |   6 -
 ...-recursive-directory-watcher-is-invoked.js |   2 -
 .../errors-for-.d.ts-change.js                |  11 -
 .../errors-for-.ts-change.js                  |  13 -
 ...g-a-deep-multilevel-import-that-changes.js |  15 -
 .../with-noEmitOnError-with-incremental.js    |  31 --
 .../with-noEmitOnError.js                     |  27 --
 .../errors-for-.d.ts-change.js                |  13 -
 .../errors-for-.ts-change.js                  |  18 --
 ...g-a-deep-multilevel-import-that-changes.js |  18 --
 .../with-noEmitOnError-with-incremental.js    |  38 ---
 .../with-noEmitOnError.js                     |  34 --
 .../errors-for-.d.ts-change.js                |  11 -
 .../errors-for-.ts-change.js                  |  13 -
 ...g-a-deep-multilevel-import-that-changes.js |  15 -
 .../with-noEmitOnError-with-incremental.js    |  31 --
 .../default/with-noEmitOnError.js             |  27 --
 .../errors-for-.d.ts-change.js                |  19 --
 .../errors-for-.ts-change.js                  |  21 --
 ...g-a-deep-multilevel-import-that-changes.js |  24 --
 .../with-noEmitOnError-with-incremental.js    |  38 ---
 .../defaultAndD/with-noEmitOnError.js         |  34 --
 .../errors-for-.d.ts-change.js                |  27 --
 .../errors-for-.ts-change.js                  |  19 --
 ...g-a-deep-multilevel-import-that-changes.js |  21 --
 .../with-noEmitOnError-with-incremental.js    |  31 --
 .../with-noEmitOnError.js                     |  31 --
 .../errors-for-.d.ts-change.js                |  29 --
 .../errors-for-.ts-change.js                  |  24 --
 ...g-a-deep-multilevel-import-that-changes.js |  24 --
 .../with-noEmitOnError-with-incremental.js    |  38 ---
 .../with-noEmitOnError.js                     |  38 ---
 .../errors-for-.d.ts-change.js                |  27 --
 .../errors-for-.ts-change.js                  |  19 --
 ...g-a-deep-multilevel-import-that-changes.js |  21 --
 .../with-noEmitOnError-with-incremental.js    |  31 --
 .../incremental/default/with-noEmitOnError.js |  31 --
 .../errors-for-.d.ts-change.js                |  35 --
 .../errors-for-.ts-change.js                  |  27 --
 ...g-a-deep-multilevel-import-that-changes.js |  30 --
 .../with-noEmitOnError-with-incremental.js    |  38 ---
 .../defaultAndD/with-noEmitOnError.js         |  38 ---
 .../errors-for-.d.ts-change.js                |  27 --
 .../errors-for-.ts-change.js                  |  15 -
 ...g-a-deep-multilevel-import-that-changes.js |  15 -
 .../with-noEmitOnError-with-incremental.js    |  31 --
 .../isolatedModules/with-noEmitOnError.js     |  31 --
 .../errors-for-.d.ts-change.js                |  35 --
 .../errors-for-.ts-change.js                  |  24 --
 ...g-a-deep-multilevel-import-that-changes.js |  30 --
 .../with-noEmitOnError-with-incremental.js    |  38 ---
 .../isolatedModulesAndD/with-noEmitOnError.js |  38 ---
 .../errors-for-.d.ts-change.js                |  11 -
 .../errors-for-.ts-change.js                  |   9 -
 ...g-a-deep-multilevel-import-that-changes.js |   9 -
 .../with-noEmitOnError-with-incremental.js    |  31 --
 .../isolatedModules/with-noEmitOnError.js     |  27 --
 .../errors-for-.d.ts-change.js                |  19 --
 .../errors-for-.ts-change.js                  |  18 --
 ...g-a-deep-multilevel-import-that-changes.js |  24 --
 .../with-noEmitOnError-with-incremental.js    |  38 ---
 .../isolatedModulesAndD/with-noEmitOnError.js |  34 --
 ...n-Windows-style-drive-root-is-lowercase.js |   4 -
 ...n-Windows-style-drive-root-is-uppercase.js |   4 -
 ...ry-symlink-target-and-import-match-disk.js |   3 -
 ...le-symlink-target-and-import-match-disk.js |   4 -
 ...nging-module-name-with-different-casing.js |   3 -
 ...target-matches-disk-but-import-does-not.js |   3 -
 ...target-matches-disk-but-import-does-not.js |   4 -
 ...link-target,-and-disk-are-all-different.js |   3 -
 ...link-target,-and-disk-are-all-different.js |  11 -
 ...link-target-agree-but-do-not-match-disk.js |   3 -
 ...link-target-agree-but-do-not-match-disk.js |   4 -
 ...k-but-directory-symlink-target-does-not.js |   3 -
 ...s-disk-but-file-symlink-target-does-not.js |   4 -
 ...ative-information-file-location-changes.js |   3 -
 ...hen-renaming-file-with-different-casing.js |   5 -
 .../editing-module-augmentation-watch.js      |   3 -
 ...for-changes-to-package-json-main-fields.js |   4 -
 .../esm-mode-file-is-edited.js                |   2 -
 ...configFile-contents-when-options-change.js |   2 -
 ...rts-errors-when-the-config-file-changes.js |   4 -
 ...nostics-when-'--noUnusedLabels'-changes.js |   4 -
 ...-a-configured-program-without-file-list.js |   6 -
 ...hould-remove-the-module-not-found-error.js |   5 -
 ...ot-files-has-changed-(new-file-on-disk).js |   6 -
 ...-root-files-has-changed-through-include.js |   5 -
 .../programUpdates/change-module-to-none.js   |   3 -
 .../programUpdates/config-file-is-deleted.js  |   2 -
 ...s-changes-in-lib-section-of-config-file.js |   3 -
 ...keys-differ-only-in-directory-seperator.js |  13 -
 .../create-watch-without-config-file.js       |   2 -
 ...eleted-files-affect-project-structure-2.js |   1 -
 .../deleted-files-affect-project-structure.js |   1 -
 .../handle-recreated-files-correctly.js       |  13 -
 ...tore-the-states-for-configured-projects.js |  25 --
 ...estore-the-states-for-inferred-projects.js |   6 -
 ...rors-correctly-with-file-not-in-rootDir.js |   3 -
 ...s-errors-correctly-with-isolatedModules.js |   3 -
 .../declarationDir-is-specified.js            |  13 -
 ...-outDir-and-declarationDir-is-specified.js |   9 -
 .../when-outDir-is-specified.js               |   7 -
 .../with-outFile.js                           |   6 -
 ...e-is-specified-with-declaration-enabled.js |  17 -
 .../without-outDir-or-outFile-is-specified.js |  11 -
 ...odule-resolution-changes-in-config-file.js |   1 -
 ...tes-diagnostics-and-emit-for-decorators.js |   6 -
 ...it-when-useDefineForClassFields-changes.js |   3 -
 .../updates-emit-on-jsx-option-change.js      |   4 -
 ...mit-when-importsNotUsedAsValues-changes.js |  12 -
 ...on-emit-is-disabled-in-compiler-options.js |   8 -
 ...when-ambient-modules-of-program-changes.js |  10 -
 ...orceConsistentCasingInFileNames-changes.js |   2 -
 ...s-errors-when-noErrorTruncation-changes.js |   2 -
 ...es-errors-when-strictNullChecks-changes.js |   6 -
 ...solution-when-resolveJsonModule-changes.js |   7 -
 ...and-new-file-is-added-as-part-of-change.js |   7 -
 .../when-creating-extensionless-file.js       |   2 -
 ...n-creating-new-file-in-symlinked-folder.js |   4 -
 ...file-is-added-to-the-referenced-project.js |  24 --
 ...ibCheck-and-skipDefaultLibCheck-changes.js |  12 -
 .../on-sample-project.js                      |  23 --
 ...-different-folders-with-no-files-clause.js |  51 ---
 ...nsitive-references-in-different-folders.js |  32 --
 .../tscWatch/resolutionCache/caching-works.js |  14 -
 .../watch-with-configFile.js                  |  13 -
 .../watch-without-configFile.js               |   9 -
 .../loads-missing-files-from-disk.js          |   9 -
 ...module-goes-missing-and-then-comes-back.js |  11 -
 ...are-global-and-installed-at-later-point.js |  26 --
 ...-no-notification-from-fs-for-index-file.js |  78 -----
 ...le-resolution-changes-to-ambient-module.js |  20 --
 ...der-that-already-contains-@types-folder.js |  11 -
 ...rogram-with-files-from-external-library.js |   2 -
 .../extraFileExtensions-are-supported.js      |   5 -
 ...createSemanticDiagnosticsBuilderProgram.js |   2 -
 ...ing-useSourceOfProjectReferenceRedirect.js |  24 --
 ...-host-implementing-getParsedCommandLine.js |  12 -
 ...-timesouts-on-host-program-gets-updated.js |   5 -
 ...inode-when-rename-event-ends-with-tilde.js |  32 --
 ...e-occurs-when-file-is-still-on-the-disk.js |   5 -
 ...when-using-file-watching-thats-on-inode.js |  20 --
 ...e-occurs-when-file-is-still-on-the-disk.js |   3 -
 ...rectory-when-renaming-file-in-subfolder.js |  10 -
 ...ymlinks-to-folders-in-recursive-folders.js |   2 -
 ...hronous-watch-directory-renaming-a-file.js |  11 -
 ...ory-with-outDir-and-declaration-enabled.js |  10 -
 .../with-non-synchronous-watch-directory.js   |  25 --
 ...lt-as-fixed-chunk-size-watch-file-works.js |   4 -
 .../using-fixed-chunk-size-polling.js         |   4 -
 ...eDirectories-option-extendedDiagnostics.js |   5 -
 ...-directory-watching-extendedDiagnostics.js |   4 -
 ...ption-with-recursive-directory-watching.js |   4 -
 .../with-excludeDirectories-option.js         |   5 -
 ...excludeFiles-option-extendedDiagnostics.js |   5 -
 .../watchOptions/with-excludeFiles-option.js  |   5 -
 210 files changed, 3 insertions(+), 3471 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index ae15b0d02b719..2b38e36f96af7 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1120,15 +1120,10 @@ namespace ts {
                         recursive,
                         inodeWatching ?
                             callbackChangingToMissingFileSystemEntry :
-                            (eventName, relativeFileName) => {
-
-                                sysLog(`sysLog:: watchPresentFileSystemEntry:: ${fileOrDirectory} ${entryKind} ${eventName}:: ${relativeFileName}`);
-                                callback(eventName, relativeFileName);
-                            }
+                            callback
                     );
                     // Watch the missing file or directory or error
                     presentWatcher.on("error", () => {
-                        sysLog(`sysLog:: watchPresentFileSystemEntry:: on Error ${fileOrDirectory} ${entryKind} rename, ""`);
                         callback("rename", "");
                         updateWatcher(watchMissingFileSystemEntry);
                     });
@@ -1145,11 +1140,7 @@ namespace ts {
             }
 
             function callbackChangingToMissingFileSystemEntry(event: "rename" | "change", relativeName: string | undefined) {
-                sysLog(`sysLog:: callbackChangingToMissingFileSystemEntry:: ${fileOrDirectory} ${entryKind} ${event}:: ${relativeName} ${inodeWatching} ${lastDirectoryPart} ${lastDirectoryPartWithDirectorySeparator}`);
-                if (relativeName && endsWith(relativeName, "~")) {
-                    relativeName = relativeName.slice(0, relativeName.length - 1);
-                    sysLog(`sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to ${relativeName}`);
-                }
+                if (relativeName && endsWith(relativeName, "~")) relativeName = relativeName.slice(0, relativeName.length - 1);
                 callback(event, relativeName);
                 // because relativeName is not guaranteed to be correct we need to check on each rename with few combinations
                 // Eg on ubuntu while watching app/node_modules the relativeName is "node_modules" which is neither relative nor full path
@@ -1173,10 +1164,7 @@ namespace ts {
             function watchPresentFileSystemEntryWithFsWatchFile(): FileWatcher {
                 return watchFile(
                     fileOrDirectory,
-                    createFileWatcherCallback((eventName, relativeFileName) => {
-                        sysLog(`sysLog:: watchPresentFileSystemEntryWithFsWatchFile:: ${fileOrDirectory} ${entryKind} ${eventName}:: ${relativeFileName}`);
-                        callback(eventName, relativeFileName);
-                    }),
+                    createFileWatcherCallback(callback),
                     fallbackPollingInterval,
                     fallbackOptions
                 );
@@ -1190,9 +1178,7 @@ namespace ts {
                 return watchFile(
                     fileOrDirectory,
                     (_fileName, eventKind) => {
-                        sysLog(`sysLog:: watchMissingFileSystemEntry:: ${fileOrDirectory} ${entryKind} ${_fileName}:: ${eventKind}`);
                         if (eventKind === FileWatcherEventKind.Created && fileSystemEntryExists(fileOrDirectory, entryKind)) {
-                            sysLog(`sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher`);
                             callback("rename", "");
                             // Call the callback for current file or directory
                             // For now it could be callback for the inner directory creation,
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
index 7e24b0a5cde10..b36912f7aa3ec 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-bad-reference.js
@@ -433,8 +433,6 @@ export function lastElementOf<T>(arr: T[]): T | undefined {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/demo/core 1 change:: utilities.ts
-
 >> Screen clear
 [12:01:07 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
index be98b50cfe64c..e8f43afdbba83 100644
--- a/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
+++ b/tests/baselines/reference/tsbuildWatch/demo/updates-with-circular-reference.js
@@ -216,8 +216,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/demo/core 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
index fc9e9b9d46051..757edf9d88cf3 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/build-mode-watches-for-changes-to-package-json-main-fields.js
@@ -278,8 +278,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
-
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
@@ -372,8 +370,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
-
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
@@ -418,7 +414,6 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.ts' does not e
 File '/user/username/projects/myproject/packages/pkg2/build/const.tsx' does not exist.
 File '/user/username/projects/myproject/packages/pkg2/build/const.d.ts' exist - use it as a name resolution result.
 ======== Module name './const.js' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/const.d.ts'. ========
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 [12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
index c288e686de02e..6b9ecac620c8c 100644
--- a/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
+++ b/tests/baselines/reference/tsbuildWatch/moduleResolution/resolves-specifier-in-output-declaration-file-from-referenced-project-correctly-with-cts-and-mts-extensions.js
@@ -269,8 +269,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: package.json
-
 >> Screen clear
 [12:01:11 AM] File change detected. Starting incremental compilation...
 
@@ -391,8 +389,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: package.json
-
 >> Screen clear
 [12:01:18 AM] File change detected. Starting incremental compilation...
 
@@ -436,7 +432,6 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.d.cts' exist -
 File '/a/lib/package.json' does not exist.
 File '/a/package.json' does not exist.
 File '/package.json' does not exist.
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 [12:01:24 AM] Found 0 errors. Watching for file changes.
 
 
@@ -504,8 +499,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: package.json
-
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
@@ -630,12 +623,6 @@ export type { TheNum } from './const.cjs';
 //// [/user/username/projects/myproject/packages/pkg2/index.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: index.cts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: 
-
 >> Screen clear
 [12:01:39 AM] File change detected. Starting incremental compilation...
 
@@ -655,16 +642,8 @@ File '/user/username/projects/myproject/packages/pkg2/const.cts' exist - use it
 File '/a/lib/package.json' does not exist.
 File '/a/package.json' does not exist.
 File '/package.json' does not exist.
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: build/index.cjs
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 rename:: build/index.d.cts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/tsconfig.tsbuildinfo
 [12:01:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/packages/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/const.cjs
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/const.d.cts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/packages/pkg2/const.cts","/user/username/projects/myproject/packages/pkg2/index.cts"]
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
index 7f8216537386c..02b66ff4809e5 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted-with-incremental.js
@@ -129,8 +129,6 @@ Input::
 //// [/user/username/projects/myproject/a.js] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
@@ -179,8 +177,6 @@ const x = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
@@ -188,8 +184,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:44 AM] Building project '/user/username/projects/myproject/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
index 1e6516c5fda81..d2b736cdf81ce 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmit/does-not-go-in-loop-when-watching-when-no-files-are-emitted.js
@@ -81,8 +81,6 @@ Input::
 //// [/user/username/projects/myproject/a.js] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-
 >> Screen clear
 [12:00:31 AM] File change detected. Starting incremental compilation...
 
@@ -131,8 +129,6 @@ const x = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
index 35395eee6a090..45d8297c323a7 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error-with-incremental.js
@@ -98,8 +98,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
@@ -159,8 +157,6 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
@@ -168,24 +164,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:00:48 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
 [12:01:09 AM] Found 0 errors. Watching for file changes.
 
 
@@ -315,8 +293,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
@@ -329,8 +305,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 2 const a: string = 10;
         ~
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:22 AM] Found 1 error. Watching for file changes.
 
 
@@ -450,8 +424,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
 
@@ -509,8 +481,6 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
 
@@ -518,13 +488,8 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:36 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:44 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -634,8 +599,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:52 AM] File change detected. Starting incremental compilation...
 
@@ -645,10 +608,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:56 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:57 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
index 20b7ddc022482..c74f6d066f6ef 100644
--- a/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
+++ b/tests/baselines/reference/tsbuildWatch/noEmitOnError/does-not-emit-any-files-on-error.js
@@ -98,8 +98,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
@@ -159,8 +157,6 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
@@ -168,20 +164,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:00:48 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:05 AM] Found 0 errors. Watching for file changes.
 
 
@@ -254,8 +236,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
 
@@ -312,8 +292,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
@@ -371,8 +349,6 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
@@ -380,11 +356,8 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:26 AM] Building project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:31 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
 [12:01:32 AM] Found 0 errors. Watching for file changes.
 
 
@@ -437,8 +410,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
@@ -448,9 +419,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:40 AM] Updating unchanged output timestamps of project '/user/username/projects/noEmitOnError/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/other.js
 [12:01:41 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
index 64dfa065bf669..9818a6cbf848d 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/incremental-updates-in-verbose-mode.js
@@ -499,8 +499,6 @@ function someFn() { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -508,11 +506,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 c
 
 [12:01:33 AM] Building project '/user/username/projects/sample1/logic/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:49 AM] Project 'sample1/tests/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:01:51 AM] Updating output timestamps of project '/user/username/projects/sample1/tests/tsconfig.json'...
@@ -667,8 +660,6 @@ export function someFn() { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
-
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
 
@@ -676,11 +667,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 c
 
 [12:01:58 AM] Building project '/user/username/projects/sample1/logic/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:14 AM] Project 'sample1/tests/tsconfig.json' is out of date because oldest output 'sample1/tests/index.js' is older than newest input 'sample1/logic/tsconfig.json'
 
 [12:02:15 AM] Building project '/user/username/projects/sample1/tests/tsconfig.json'...
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
index 8dc3cbee77b88..191bed28c0501 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-file-with-no-error-changes.js
@@ -158,8 +158,6 @@ export var myClassWithError = class {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
@@ -211,8 +209,6 @@ export class myClass2 { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.ts
-
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
index fec6520daa708..b9b9221ded15b 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/introduceError/when-fixing-errors-only-changed-file-is-emitted.js
@@ -158,8 +158,6 @@ export var myClassWithError = class {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
@@ -214,17 +212,9 @@ export var myClassWithError = class {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
-
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
index 17cdd0f246f98..b5611cbdf261e 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-file-with-no-error-changes.js
@@ -82,8 +82,6 @@ export class myClass2 { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithoutError.ts
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
index 68617fa5a81bb..b95e38e00593a 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/declarationEmitErrors/when-fixing-error-files-all-files-are-emitted.js
@@ -85,23 +85,9 @@ export var myClassWithError = class {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: fileWithError.ts
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithError.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithError.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithoutError.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: fileWithoutError.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/solution/app 1 change:: 
 [12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
index 2150943719b46..0ec3a1c545cd5 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-not-used.js
@@ -482,8 +482,6 @@ let y: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
-
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
@@ -492,8 +490,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 c
 8 let y: string = 10;
       ~
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:31 AM] Found 1 error. Watching for file changes.
 
 
@@ -638,8 +634,6 @@ let x: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:35 AM] File change detected. Starting incremental compilation...
 
@@ -648,8 +642,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 ch
 5 let x: string = 10;
       ~
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 sample1/logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 8 let y: string = 10;
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
index fe1de9ac155d1..4ada4bc565f78 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/reportErrors/when-preserveWatchOutput-is-passed-on-command-line.js
@@ -481,7 +481,6 @@ let y: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
 sample1/logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
@@ -489,8 +488,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 c
 8 let y: string = 10;
       ~
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:31 AM] Found 1 error. Watching for file changes.
 
 
@@ -635,7 +632,6 @@ let x: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
 [12:01:35 AM] File change detected. Starting incremental compilation...
 
 sample1/core/index.ts:5:5 - error TS2322: Type 'number' is not assignable to type 'string'.
@@ -643,8 +639,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 ch
 5 let x: string = 10;
       ~
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 sample1/logic/index.ts:8:5 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 8 let y: string = 10;
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
index 2083cf6ee2fc9..826bc6fcd6615 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit-with-outDir-specified.js
@@ -178,9 +178,6 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
@@ -188,18 +185,8 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 ch
 
 [12:00:51 AM] Building project '/user/username/projects/sample1/core/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: outDir/file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: outDir/file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/tsconfig.tsbuildinfo
 [12:01:00 AM] Updating unchanged output timestamps of project '/user/username/projects/sample1/core/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: outDir/tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
index 140331b70f444..4f5076fc359ea 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit.js
@@ -193,9 +193,6 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
@@ -203,22 +200,8 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 ch
 
 [12:00:52 AM] Building project '/user/username/projects/sample1/core/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
 [12:01:03 AM] Updating unchanged output timestamps of project '/user/username/projects/sample1/core/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:07 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
index ea3ed9e645707..9c056f5887166 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/watches-config-files-that-are-not-present.js
@@ -221,16 +221,6 @@ Output::
 >> Screen clear
 [12:00:57 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
 
 
 Program root files: ["/user/username/projects/sample1/logic/index.ts"]
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
index e842fb4860564..8ee1d321ec24f 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-project-change-introduces-error-in-the-down-stream-project-and-then-fixes-it.js
@@ -181,15 +181,9 @@ export function createSomeObject(): SomeObject
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 App/app.ts:2:20 - error TS2551: Property 'message' does not exist on type 'SomeObject'. Did you mean 'message2'?
 
 2 createSomeObject().message;
@@ -328,16 +322,9 @@ export function createSomeObject(): SomeObject
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.ts
-
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: library.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/library 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/app 1 change:: app.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
index 77ca2e55b4cb1..5788471efc1e4 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js
@@ -243,16 +243,9 @@ function myFunc() { return 10; }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/index.ts"]
@@ -353,11 +346,6 @@ Change:: Build logic
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.baseline.txt
 [12:01:25 AM] Found 0 errors. Watching for file changes.
 
 
@@ -507,16 +495,9 @@ function myFunc() { return 100; }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:29 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.tsbuildinfo.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/index.ts"]
@@ -613,11 +594,6 @@ Change:: Build logic
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.tsbuildinfo.baseline.txt
 [12:01:58 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index a2b08a732c888..eb685e63ee0bc 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -441,22 +441,9 @@ export const newFileConst = 30;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -571,10 +558,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:27 AM] Found 0 errors. Watching for file changes.
 
 
@@ -651,19 +634,9 @@ export class someClass2 { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -786,10 +759,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:47 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
index 9af35c779747f..345fc6474550c 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/change-builds-changes-and-reports-found-errors-message.js
@@ -445,17 +445,9 @@ export class someClass { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -573,11 +565,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:55 AM] Found 0 errors. Watching for file changes.
 
 
@@ -809,17 +796,9 @@ export function multiply(a: number, b: number) { return a * b; }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:59 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -929,11 +908,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1167,18 +1141,9 @@ export class someClass2 { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:02:47 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -1304,11 +1269,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:03:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
index 261f3c8c9663c..b8e271ccd50fd 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-circular-project-reference/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -445,21 +445,9 @@ function foo() { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:30 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
index 24b29694504dc..a72f345ad4b19 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/builds-when-new-file-is-added,-and-its-subsequent-updates.js
@@ -475,26 +475,9 @@ export const newFileConst = 30;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-
 >> Screen clear
 [12:01:23 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 rename:: newfile.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -616,10 +599,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:39 AM] Found 0 errors. Watching for file changes.
 
 
@@ -696,22 +675,9 @@ export class someClass2 { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.ts
-
 >> Screen clear
 [12:01:43 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: newfile.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts","/user/username/projects/sample1/core/newfile.ts"]
@@ -841,10 +807,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:02:02 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
index cd2c46aa1f4b4..059ce163d3de5 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/change-builds-changes-and-reports-found-errors-message.js
@@ -479,19 +479,9 @@ export class someClass { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -615,11 +605,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:08 AM] Found 0 errors. Watching for file changes.
 
 
@@ -851,19 +836,9 @@ export function multiply(a: number, b: number) { return a * b; }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:02:12 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -979,11 +954,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:56 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1217,20 +1187,9 @@ export class someClass2 { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:03:03 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/sample1/core/anotherModule.ts","/user/username/projects/sample1/core/index.ts"]
@@ -1362,11 +1321,6 @@ Change:: Build logic and tests
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:03:48 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
index 89f79ea78be8f..f7f454b20cef9 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/with-simple-project-reference-graph/non-local-change-does-not-start-build-of-referencing-projects.js
@@ -479,23 +479,9 @@ function foo() { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.ts
-
 >> Screen clear
 [12:01:24 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: anotherModule.d.ts.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/core 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
 [12:01:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
index 381cecd6c305e..0b05490ab3eb6 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-when-noUnusedParameters-changes-to-false.js
@@ -71,13 +71,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
index 439f17cc559c9..f39bf560fe98d 100644
--- a/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
+++ b/tests/baselines/reference/tsbuildWatch/programUpdates/works-with-extended-source-files.js
@@ -405,9 +405,6 @@ Output::
 
 [12:01:19 AM] Building project '/a/b/project2.tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: other.js
 [12:01:29 AM] Found 0 errors. Watching for file changes.
 
 
@@ -480,8 +477,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: alpha.tsconfig.json
-
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
 
@@ -491,11 +486,6 @@ sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: alpha.tsconfig.json
 
 [12:01:38 AM] Updating unchanged output timestamps of project '/a/b/project1.tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.d.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: project1.tsconfig.tsbuildinfo
 
 
 Program root files: ["/a/b/commonFile1.ts","/a/b/commonFile2.ts"]
@@ -554,9 +544,6 @@ Output::
 
 [12:01:42 AM] Updating unchanged output timestamps of project '/a/b/project2.tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: other.js
 [12:01:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
index 6fd94479da3a3..8dc08e6383227 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-23-projects-in-a-solution.js
@@ -1841,8 +1841,6 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:06:32 AM] File change detected. Starting incremental compilation...
 
@@ -1850,164 +1848,94 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:06:34 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:06:47 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:49 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:06:50 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:06:53 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:55 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:06:56 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:06:58 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:06:59 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 [12:07:02 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:07:05 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:07 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:07:08 AM] Project 'pkg8/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:10 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:07:11 AM] Project 'pkg9/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:13 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:07:14 AM] Project 'pkg10/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:16 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 [12:07:17 AM] Project 'pkg11/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:19 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:07:20 AM] Project 'pkg12/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:22 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:07:23 AM] Project 'pkg13/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:25 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:07:26 AM] Project 'pkg14/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:28 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:07:29 AM] Project 'pkg15/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:31 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 [12:07:32 AM] Project 'pkg16/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:34 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: tsconfig.tsbuildinfo
 [12:07:35 AM] Project 'pkg17/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:37 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: tsconfig.tsbuildinfo
 [12:07:38 AM] Project 'pkg18/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:40 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: tsconfig.tsbuildinfo
 [12:07:41 AM] Project 'pkg19/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:43 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: tsconfig.tsbuildinfo
 [12:07:44 AM] Project 'pkg20/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:46 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: tsconfig.tsbuildinfo
 [12:07:47 AM] Project 'pkg21/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:49 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: tsconfig.tsbuildinfo
 [12:07:50 AM] Project 'pkg22/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:07:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: tsconfig.tsbuildinfo
 [12:07:53 AM] Found 0 errors. Watching for file changes.
 
 
@@ -2447,8 +2375,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:07:56 AM] File change detected. Starting incremental compilation...
 
@@ -2456,10 +2382,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:07:58 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -2684,45 +2606,30 @@ Output::
 
 [12:08:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:08:15 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:16 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:08:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:08:19 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:20 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:08:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:08:23 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:24 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:08:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:08:27 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:28 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:08:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -2955,45 +2862,30 @@ Output::
 
 [12:08:34 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:08:35 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:36 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:08:38 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:08:39 AM] Project 'pkg8/tsconfig.json' is out of date because oldest output 'pkg8/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:40 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
 [12:08:42 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:08:43 AM] Project 'pkg9/tsconfig.json' is out of date because oldest output 'pkg9/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:44 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
 [12:08:46 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:08:47 AM] Project 'pkg10/tsconfig.json' is out of date because oldest output 'pkg10/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:48 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 [12:08:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg6/index.ts"]
@@ -3226,45 +3118,30 @@ Output::
 
 [12:08:54 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:08:55 AM] Project 'pkg12/tsconfig.json' is out of date because oldest output 'pkg12/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:08:56 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
 [12:08:58 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:08:59 AM] Project 'pkg13/tsconfig.json' is out of date because oldest output 'pkg13/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:00 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
 [12:09:02 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:09:03 AM] Project 'pkg14/tsconfig.json' is out of date because oldest output 'pkg14/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:04 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
 [12:09:06 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:09:07 AM] Project 'pkg15/tsconfig.json' is out of date because oldest output 'pkg15/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:08 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 [12:09:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg11/index.ts"]
@@ -3497,45 +3374,30 @@ Output::
 
 [12:09:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: tsconfig.tsbuildinfo
 [12:09:15 AM] Project 'pkg17/tsconfig.json' is out of date because oldest output 'pkg17/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:16 AM] Building project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
 [12:09:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: tsconfig.tsbuildinfo
 [12:09:19 AM] Project 'pkg18/tsconfig.json' is out of date because oldest output 'pkg18/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:20 AM] Building project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
 [12:09:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: tsconfig.tsbuildinfo
 [12:09:23 AM] Project 'pkg19/tsconfig.json' is out of date because oldest output 'pkg19/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:24 AM] Building project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
 [12:09:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: tsconfig.tsbuildinfo
 [12:09:27 AM] Project 'pkg20/tsconfig.json' is out of date because oldest output 'pkg20/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:28 AM] Building project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
 [12:09:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg16/index.ts"]
@@ -3768,18 +3630,12 @@ Output::
 
 [12:09:35 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: tsconfig.tsbuildinfo
 [12:09:36 AM] Project 'pkg22/tsconfig.json' is out of date because oldest output 'pkg22/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:09:37 AM] Building project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
 [12:09:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: tsconfig.tsbuildinfo
 [12:09:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -4124,8 +3980,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:09:43 AM] File change detected. Starting incremental compilation...
 
@@ -4133,10 +3987,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:09:45 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -4363,45 +4213,30 @@ Output::
 
 [12:10:01 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:10:02 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:03 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:10:05 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:10:06 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:07 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:10:09 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:10:10 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:11 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:10:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:10:14 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:15 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:10:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -4634,45 +4469,30 @@ Output::
 
 [12:10:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:10:22 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:23 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:10:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:10:26 AM] Project 'pkg8/tsconfig.json' is out of date because oldest output 'pkg8/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:27 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
 [12:10:29 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:10:30 AM] Project 'pkg9/tsconfig.json' is out of date because oldest output 'pkg9/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:31 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
 [12:10:33 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:10:34 AM] Project 'pkg10/tsconfig.json' is out of date because oldest output 'pkg10/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:10:35 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 [12:10:37 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg6/index.ts"]
@@ -4902,8 +4722,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:10:40 AM] File change detected. Starting incremental compilation...
 
@@ -4911,80 +4729,46 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:10:42 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:10:55 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:10:57 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:10:58 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:00 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:11:01 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:03 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:11:04 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:06 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:11:07 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:09 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 [12:11:10 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:12 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:11:13 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:15 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:11:16 AM] Project 'pkg8/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:18 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:11:19 AM] Project 'pkg9/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:21 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:11:22 AM] Project 'pkg10/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:11:24 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -5237,45 +5021,30 @@ Output::
 
 [12:11:28 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:11:29 AM] Project 'pkg12/tsconfig.json' is out of date because oldest output 'pkg12/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:30 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
 [12:11:32 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:11:33 AM] Project 'pkg13/tsconfig.json' is out of date because oldest output 'pkg13/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:34 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
 [12:11:36 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:11:37 AM] Project 'pkg14/tsconfig.json' is out of date because oldest output 'pkg14/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:38 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
 [12:11:40 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:11:41 AM] Project 'pkg15/tsconfig.json' is out of date because oldest output 'pkg15/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:11:42 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 [12:11:44 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg11/index.ts"]
@@ -5505,8 +5274,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:11:48 AM] File change detected. Starting incremental compilation...
 
@@ -5514,10 +5281,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:11:50 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -5747,45 +5510,30 @@ Output::
 
 [12:12:06 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:12:07 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:08 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:12:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:12:11 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:12 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:12:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:12:15 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:16 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:12:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:12:19 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:20 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:12:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -6018,45 +5766,30 @@ Output::
 
 [12:12:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:12:27 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:28 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:12:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:12:31 AM] Project 'pkg8/tsconfig.json' is out of date because oldest output 'pkg8/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:32 AM] Building project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
 [12:12:34 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg8/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg8 1 change:: tsconfig.tsbuildinfo
 [12:12:35 AM] Project 'pkg9/tsconfig.json' is out of date because oldest output 'pkg9/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:36 AM] Building project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
 [12:12:38 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg9/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg9 1 change:: tsconfig.tsbuildinfo
 [12:12:39 AM] Project 'pkg10/tsconfig.json' is out of date because oldest output 'pkg10/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:40 AM] Building project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
 [12:12:42 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg10/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg10 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg6/index.ts"]
@@ -6289,45 +6022,30 @@ Output::
 
 [12:12:46 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg11/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg11 1 change:: tsconfig.tsbuildinfo
 [12:12:47 AM] Project 'pkg12/tsconfig.json' is out of date because oldest output 'pkg12/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:48 AM] Building project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
 [12:12:50 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg12/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg12 1 change:: tsconfig.tsbuildinfo
 [12:12:51 AM] Project 'pkg13/tsconfig.json' is out of date because oldest output 'pkg13/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:52 AM] Building project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
 [12:12:54 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg13/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg13 1 change:: tsconfig.tsbuildinfo
 [12:12:55 AM] Project 'pkg14/tsconfig.json' is out of date because oldest output 'pkg14/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:12:56 AM] Building project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
 [12:12:58 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg14/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg14 1 change:: tsconfig.tsbuildinfo
 [12:12:59 AM] Project 'pkg15/tsconfig.json' is out of date because oldest output 'pkg15/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:00 AM] Building project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
 [12:13:02 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg15/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg15 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg11/index.ts"]
@@ -6560,45 +6278,30 @@ Output::
 
 [12:13:06 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg16/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg16 1 change:: tsconfig.tsbuildinfo
 [12:13:07 AM] Project 'pkg17/tsconfig.json' is out of date because oldest output 'pkg17/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:08 AM] Building project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
 [12:13:10 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg17/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg17 1 change:: tsconfig.tsbuildinfo
 [12:13:11 AM] Project 'pkg18/tsconfig.json' is out of date because oldest output 'pkg18/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:12 AM] Building project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
 [12:13:14 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg18/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg18 1 change:: tsconfig.tsbuildinfo
 [12:13:15 AM] Project 'pkg19/tsconfig.json' is out of date because oldest output 'pkg19/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:16 AM] Building project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
 [12:13:18 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg19/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg19 1 change:: tsconfig.tsbuildinfo
 [12:13:19 AM] Project 'pkg20/tsconfig.json' is out of date because oldest output 'pkg20/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:20 AM] Building project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
 [12:13:22 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg20/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg20 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg16/index.ts"]
@@ -6831,18 +6534,12 @@ Output::
 
 [12:13:26 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg21/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg21 1 change:: tsconfig.tsbuildinfo
 [12:13:27 AM] Project 'pkg22/tsconfig.json' is out of date because oldest output 'pkg22/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:13:28 AM] Building project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
 [12:13:30 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg22/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg22 1 change:: tsconfig.tsbuildinfo
 [12:13:31 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
index ae086cd85a384..9d39f6ac125d3 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-3-projects-in-a-solution.js
@@ -281,8 +281,6 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
 
@@ -290,24 +288,14 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:01:14 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:27 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:01:29 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:01:30 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:01:32 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:01:33 AM] Found 0 errors. Watching for file changes.
 
 
@@ -447,8 +435,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
@@ -456,10 +442,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:01:38 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -564,18 +546,12 @@ Output::
 
 [12:01:54 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:01:55 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:01:56 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:58 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:01:59 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
index 6930e6d52487c..38b7bfc6373ef 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-5-projects-in-a-solution.js
@@ -437,8 +437,6 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
@@ -446,38 +444,22 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:01:46 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:59 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:02:02 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:02:05 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:07 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:02:08 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:10 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:02:11 AM] Found 0 errors. Watching for file changes.
 
 
@@ -647,8 +629,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:02:14 AM] File change detected. Starting incremental compilation...
 
@@ -656,10 +636,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:02:16 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -776,36 +752,24 @@ Output::
 
 [12:02:32 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:02:33 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:02:34 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:02:36 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:02:37 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:02:38 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:02:40 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:02:41 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:02:42 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:02:44 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:02:45 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
index 367c9b6f5961d..51f3aaa618d33 100644
--- a/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
+++ b/tests/baselines/reference/tsbuildWatch/projectsBuilding/when-there-are-8-projects-in-a-solution.js
@@ -671,8 +671,6 @@ export const pkg0 = 0;const someConst2 = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:02:32 AM] File change detected. Starting incremental compilation...
 
@@ -680,59 +678,34 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:02:34 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:02:47 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:49 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:02:50 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:02:53 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:55 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:02:56 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:02:58 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:02:59 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:03:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 [12:03:02 AM] Project 'pkg6/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:03:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:03:05 AM] Project 'pkg7/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:03:07 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:03:08 AM] Found 0 errors. Watching for file changes.
 
 
@@ -947,8 +920,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:03:11 AM] File change detected. Starting incremental compilation...
 
@@ -956,10 +927,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:03:13 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -1094,45 +1061,30 @@ Output::
 
 [12:03:29 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:03:30 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:31 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:03:33 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:03:34 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:35 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:03:37 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:03:38 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:39 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:03:41 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:03:42 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:43 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:03:45 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -1275,18 +1227,12 @@ Output::
 
 [12:03:49 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:03:50 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:03:51 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:03:53 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:03:54 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1451,8 +1397,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:03:57 AM] File change detected. Starting incremental compilation...
 
@@ -1460,10 +1404,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:03:59 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -1600,45 +1540,30 @@ Output::
 
 [12:04:16 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:04:17 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:18 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:04:20 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:04:21 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:22 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:04:24 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:04:25 AM] Project 'pkg4/tsconfig.json' is out of date because oldest output 'pkg4/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:26 AM] Building project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
 [12:04:28 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:04:29 AM] Project 'pkg5/tsconfig.json' is out of date because oldest output 'pkg5/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:04:30 AM] Building project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
 [12:04:32 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg1/index.ts"]
@@ -1778,8 +1703,6 @@ export const pkg0 = 0;const someConst2 = 10;export const someConst = 10;export c
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.ts
-
 >> Screen clear
 [12:04:35 AM] File change detected. Starting incremental compilation...
 
@@ -1787,45 +1710,26 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1
 
 [12:04:37 AM] Building project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:04:50 AM] Project 'pkg1/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:04:52 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: tsconfig.tsbuildinfo
 [12:04:53 AM] Project 'pkg2/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:04:55 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: tsconfig.tsbuildinfo
 [12:04:56 AM] Project 'pkg3/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:04:58 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: tsconfig.tsbuildinfo
 [12:04:59 AM] Project 'pkg4/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:05:01 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg4/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg4 1 change:: tsconfig.tsbuildinfo
 [12:05:02 AM] Project 'pkg5/tsconfig.json' is up to date with .d.ts files from its dependencies
 
 [12:05:04 AM] Updating output timestamps of project '/user/username/projects/myproject/pkg5/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg5 1 change:: tsconfig.tsbuildinfo
 
 
 Program root files: ["/user/username/projects/myproject/pkg0/index.ts"]
@@ -1973,18 +1877,12 @@ Output::
 
 [12:05:08 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg6/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg6 1 change:: tsconfig.tsbuildinfo
 [12:05:09 AM] Project 'pkg7/tsconfig.json' is out of date because oldest output 'pkg7/index.js' is older than newest input 'pkg0/tsconfig.json'
 
 [12:05:10 AM] Building project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
 [12:05:12 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg7/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg7 1 change:: tsconfig.tsbuildinfo
 [12:05:13 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
index 96e1a7837424a..3458c8a45830f 100644
--- a/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
+++ b/tests/baselines/reference/tsbuildWatch/publicApi/with-custom-transformers.js
@@ -256,8 +256,6 @@ export function f2() { } // trailing
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: index.ts
-
 >> Screen clear
 [12:00:55 AM] File change detected. Starting incremental compilation...
 
@@ -265,19 +263,12 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared
 
 [12:00:57 AM] Building project '/user/username/projects/myproject/shared/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/shared 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 [12:01:10 AM] Project 'webpack/tsconfig.json' is out of date because oldest output 'webpack/index.js' is older than newest input 'shared/tsconfig.json'
 
 [12:01:11 AM] Building project '/user/username/projects/myproject/webpack/tsconfig.json'...
 
 [12:01:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/webpack/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/webpack 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/webpack 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/webpack 1 change:: tsconfig.tsbuildinfo
 [12:01:14 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
index 811a42de30c2e..ae54838ae4d6b 100644
--- a/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
+++ b/tests/baselines/reference/tsbuildWatch/reexport/Reports-errors-correctly.js
@@ -264,8 +264,6 @@ export interface Session {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/reexport/src/pure 1 change:: session.ts
-
 >> Screen clear
 [12:01:07 AM] File change detected. Starting incremental compilation...
 
@@ -431,8 +429,6 @@ export interface Session {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/reexport/src/pure 1 change:: session.ts
-
 >> Screen clear
 [12:01:34 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
index db2348e0bb6b5..9aebd0d53e615 100644
--- a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
+++ b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects-with-single-watcher-per-file.js
@@ -229,28 +229,24 @@ Output::
 
 [12:01:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:14 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:15 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:18 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:19 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:22 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:23 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:01:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -415,21 +411,18 @@ Output::
 
 [12:01:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:40 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:41 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:44 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:45 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
index 11ea03a188998..ad4d9d4891d81 100644
--- a/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
+++ b/tests/baselines/reference/tsbuildWatch/watchEnvironment/same-file-in-multiple-projects.js
@@ -232,28 +232,24 @@ Output::
 
 [12:01:13 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:14 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:15 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:17 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:18 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:19 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:21 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:22 AM] Project 'pkg3/tsconfig.json' is out of date because oldest output 'pkg3/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:23 AM] Building project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
 [12:01:25 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg3/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg3 1 change:: index.js
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -423,21 +419,18 @@ Output::
 
 [12:01:39 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg0/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg0 1 change:: index.js
 [12:01:40 AM] Project 'pkg1/tsconfig.json' is out of date because oldest output 'pkg1/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:41 AM] Building project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
 [12:01:43 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg1/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg1 1 change:: index.js
 [12:01:44 AM] Project 'pkg2/tsconfig.json' is out of date because oldest output 'pkg2/index.js' is older than newest input 'typings/xterm.d.ts'
 
 [12:01:45 AM] Building project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
 [12:01:47 AM] Updating unchanged output timestamps of project '/user/username/projects/myproject/pkg2/tsconfig.json'...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/pkg2 1 change:: index.js
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
index 13eaa8fcc6a5b..b2c561112eb81 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/createWatchOfConfigFile.js
@@ -71,10 +71,8 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: f.ts
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry::  1 change:: f.js
 [12:00:23 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
index 37dbaf9360641..b096bac970057 100644
--- a/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
+++ b/tests/baselines/reference/tscWatch/consoleClearing/when-preserveWatchOutput-is-true-in-config-file/when-createWatchProgram-is-invoked-with-configFileParseResult-on-WatchCompilerHostOfConfigFile.js
@@ -70,10 +70,8 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: f.ts
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry::  1 change:: f.js
 [12:00:23 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
index 32537ebf8b9f1..102a3122368ca 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
@@ -75,15 +75,9 @@ var b = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 rename:: file.ts
-sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 rename:: file.ts
-sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 change:: 
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /home/username/project/app 1 change:: file.js
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
index 10c8410f08eef..9567f0deb6e50 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-file-content/should-emit-specified-file.js
@@ -109,14 +109,9 @@ export function Foo() { return 10; }export function foo2() { return 2; }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.ts
-
 >> Screen clear
 [12:00:29 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f3.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
@@ -183,13 +178,9 @@ export function Foo() { return 10; }export function foo2() { return 2; }export f
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f2.js
 [12:00:49 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
index 49c83ee1c7b6a..18c5c07ceb7cc 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--isolatedModules'-is-specified.js
@@ -139,12 +139,9 @@ export var T: number;export function Foo() { };
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
 a/b/globalFile3.ts:1:1 - error TS1208: 'globalFile3.ts' cannot be compiled under '--isolatedModules' because it is considered a global script file. Add an import, export, or an empty 'export {}' statement to make it a module.
 
 1 interface GlobalFoo { age: number }
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
index 6c16f70ec573f..04f23c2aaa5a2 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-always-return-the-file-itself-if-'--out'-or-'--outFile'-is-specified.js
@@ -138,12 +138,9 @@ export var T: number;export function Foo() { };
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: out.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
index c34cc2418dea2..b5c71000f714a 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-deleted-files.js
@@ -135,15 +135,9 @@ export var T: number;export function Foo() { };
 //// [/a/b/file1Consumer2.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: file1Consumer2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
index fdf42df7712dc..f4707855b3345 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-newly-created-files.js
@@ -137,18 +137,9 @@ import {Foo} from "./moduleFile1"; let y = Foo();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: file1Consumer3.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: file1Consumer3.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:00:52 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
index 351f027b7190b..c11c863a1663d 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-be-up-to-date-with-the-reference-map-changes.js
@@ -134,12 +134,9 @@ export let y = Foo();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 a/b/file1Consumer1.ts:1:16 - error TS2304: Cannot find name 'Foo'.
 
 1 export let y = Foo();
@@ -208,13 +205,9 @@ export var T: number;export function Foo() { };
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
 a/b/file1Consumer1.ts:1:16 - error TS2304: Cannot find name 'Foo'.
 
 1 export let y = Foo();
@@ -288,12 +281,9 @@ import {Foo} from "./moduleFile1";let y = Foo();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
-
 >> Screen clear
 [12:00:57 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
@@ -357,14 +347,9 @@ export let y = Foo();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 a/b/file1Consumer1.ts:1:9 - error TS2305: Module '"./moduleFile1"' has no exported member 'Foo'.
 
 1 import {Foo} from "./moduleFile1";let y = Foo();
@@ -450,15 +435,9 @@ export var T: number;export function Foo() { };
 //// [/a/b/file1Consumer1.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:01:23 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:01:33 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
index 66782a2e0b566..5e4bee56e5d58 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-contains-only-itself-if-a-module-file's-shape-didn't-change,-and-all-files-referencing-it-if-its-shape-changed.js
@@ -134,14 +134,9 @@ export var T: number;export function Foo() { };
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -213,12 +208,9 @@ export var T: number;export function Foo() { console.log('hi'); };
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
 a/b/moduleFile1.ts:1:46 - error TS2584: Cannot find name 'console'. Do you need to change your target library? Try changing the 'lib' compiler option to include 'dom'.
 
 1 export var T: number;export function Foo() { console.log('hi'); };
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
index 632852185fa0e..cdbce1ebf488b 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-non-existing-code-file.js
@@ -92,12 +92,9 @@ export var x = Foo();export var yy = Foo();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.ts
-
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.js
 a/b/referenceFile1.ts:1:22 - error TS6053: File '/a/b/moduleFile2.ts' not found.
 
 1 /// <reference path="./moduleFile2.ts" />
@@ -168,15 +165,9 @@ export var Foo4 = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.js
 a/b/referenceFile1.ts:2:16 - error TS2304: Cannot find name 'Foo'.
 
 2 export var x = Foo();export var yy = Foo();
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
index bc031dbd2623a..9f19ac324e202 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-detect-removed-code-file.js
@@ -99,13 +99,9 @@ Input::
 //// [/a/b/moduleFile1.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: referenceFile1.js
 a/b/referenceFile1.ts:1:22 - error TS6053: File '/a/b/moduleFile1.ts' not found.
 
 1 /// <reference path="./moduleFile1.ts" />
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
index db1b85eef2955..dcabd0690ecbc 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
@@ -134,16 +134,9 @@ interface GlobalFoo { age: number }var T2: string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: globalFile3.ts
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: globalFile3.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile2.js
 [12:00:53 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
index b3e5011bb110f..46553cf38b57d 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-cascaded-affected-file-list.js
@@ -147,13 +147,9 @@ import {Foo} from "./moduleFile1"; export var y = 10;export var T: number;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1Consumer1.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -223,14 +219,9 @@ export var T: number;export function Foo() { };
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
 [12:01:02 AM] Found 0 errors. Watching for file changes.
 
 
@@ -308,16 +299,9 @@ import {Foo} from "./moduleFile1"; export var y = 10;export var T: number;export
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1Consumer1Consumer1.js
 [12:01:21 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
index 2737c00d55108..7cd30bac07b7c 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-work-fine-for-files-with-circular-references.js
@@ -97,13 +97,9 @@ export var t1 = 10;export var t3 = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.ts
-
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file2.js
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
index 3bf69033301de..17fec0923ba94 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
@@ -86,13 +86,9 @@ let x = 11
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
-
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b.js
 [12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
@@ -148,13 +144,9 @@ let xy = 11
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b.js
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
index a3b210b6c55a7..422ae9350d56d 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
@@ -77,12 +77,9 @@ let x = 11
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
-
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -133,12 +130,9 @@ let xy = 11
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
index 57728b97c5077..dec712bb5bd5b 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-outFile.js
@@ -77,12 +77,9 @@ let x = 11
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
-
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -133,12 +130,9 @@ let xy = 11
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: a.ts
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: out.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
index aa692ee55e945..59d6f8709809e 100644
--- a/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
+++ b/tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
@@ -86,8 +86,6 @@ var zz30 = 100;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/rootfolder/project/scripts 1 rename:: TypeScript.ts
-
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
index 4272cbcea36af..588dd0314619b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
@@ -111,9 +109,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
@@ -174,9 +169,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
@@ -237,9 +229,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
index 18518fb78ed74..3c4a303ac4d75 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
@@ -134,14 +134,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -219,13 +214,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -300,13 +291,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 7c1d44cfc35a1..f6870d4839f63 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,16 +184,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
 [12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
@@ -270,13 +263,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:04 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:11 AM] Found 0 errors. Watching for file changes.
 
 
@@ -344,13 +333,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:22 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index 4e3a6ee79324b..1bf3370f68001 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,27 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -381,12 +363,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -394,7 +373,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -517,8 +495,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -576,16 +552,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -696,8 +667,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index 53d8f55173640..8f309c9a27f38 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -97,8 +97,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -158,25 +156,9 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
@@ -247,8 +229,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
@@ -305,8 +285,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -364,12 +342,9 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
@@ -424,8 +399,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 9133600506473..79e6631c3f518 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,10 +40,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -117,9 +113,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
@@ -180,9 +173,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
@@ -243,9 +233,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
index 66f8cda0d13a7..373706d52b51b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,15 +151,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:00:55 AM] Found 0 errors. Watching for file changes.
 
 
@@ -236,15 +230,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:59 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
@@ -321,15 +309,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 212fde67d6fcf..a56820f7ba866 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,15 +214,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -318,15 +312,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:11 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -422,15 +410,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index 1ed125b0faf66..7a3452236305e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -174,8 +174,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -235,33 +233,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -403,12 +379,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -416,7 +389,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -540,8 +512,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -599,17 +569,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -722,8 +686,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index acd31dd9f41a7..a660578a35d28 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -97,8 +97,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -158,31 +156,9 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
@@ -267,8 +243,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -325,8 +299,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
@@ -384,13 +356,9 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -446,8 +414,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
index a823ee84d13ec..631343058a2df 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
@@ -111,9 +109,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
@@ -181,9 +176,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
@@ -246,9 +238,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
index 80b3e7ab6f5b6..ef905fec9f71d 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/deepImportChanges/errors-for-.ts-change.js
@@ -134,14 +134,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -219,13 +214,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:00:57 AM] Found 0 errors. Watching for file changes.
 
 
@@ -297,13 +288,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:01 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 7908db053821c..ab0c14cc99bcc 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,16 +184,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
 [12:01:00 AM] Found 0 errors. Watching for file changes.
 
 
@@ -270,13 +263,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:04 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -364,13 +353,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:15 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:22 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
index b0a79435ec614..388c3ea98bdb6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError-with-incremental.js
@@ -178,8 +178,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -239,27 +237,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -385,12 +367,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -398,7 +377,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -520,8 +498,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -579,16 +555,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -698,8 +669,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
index f600fe003dd92..5b49bc9b5c4fd 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/default/with-noEmitOnError.js
@@ -103,8 +103,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -164,25 +162,9 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
@@ -253,8 +235,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
@@ -311,8 +291,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -370,12 +348,9 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
@@ -430,8 +405,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
index 1c951a2e9282a..699571df19343 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,10 +40,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -117,14 +113,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -190,14 +181,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
@@ -258,14 +244,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
index 4193ca00dcef2..1c4a21d2285bb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,16 +151,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -245,16 +238,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:18 AM] Found 0 errors. Watching for file changes.
 
 
@@ -334,16 +320,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:22 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 076f55957da12..c21f835e5b510 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,17 +214,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:13 AM] Found 0 errors. Watching for file changes.
 
 
@@ -310,17 +302,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -422,17 +406,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
 [12:01:59 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
index a9e15a098daa1..03fa4e8f54925 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,33 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -401,12 +377,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -414,7 +387,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -537,8 +509,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -596,17 +566,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -718,8 +682,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
index 502b157b6c520..b3308300226e6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/defaultAndD/with-noEmitOnError.js
@@ -97,8 +97,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -158,31 +156,9 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
@@ -267,8 +243,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -325,8 +299,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
@@ -384,13 +356,9 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -446,8 +414,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
index d5a6c8568da35..66f60506f1f5a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,14 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -184,18 +178,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -320,18 +307,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -456,18 +436,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:02 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
index a3606cfd1fe1c..1dd6ac58db846 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/deepImportChanges/errors-for-.ts-change.js
@@ -203,15 +203,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -219,7 +213,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:53 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -368,14 +361,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -383,7 +371,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:10 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -529,14 +516,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -544,7 +526,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:27 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 9c299deb465c9..1bcca5eaac7e8 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -328,20 +328,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:07 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -512,17 +503,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:24 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -684,17 +669,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:41 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
index 49931f851f2e9..ed442af297e49 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError-with-incremental.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,27 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -381,12 +363,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -394,7 +373,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -517,8 +495,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -576,16 +552,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -696,8 +667,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
index 05db41a17298a..6d1212b6674c5 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependencies/with-noEmitOnError.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,27 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -381,12 +363,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -394,7 +373,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -517,8 +495,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -576,16 +552,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -696,8 +667,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 9a9a3900fb9de..df8601c2f13a0 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,16 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -188,18 +180,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -322,18 +307,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:53 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -456,18 +434,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
index 8ffe146b50c9c..3416312008eda 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -218,19 +218,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:02 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -372,19 +364,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:25 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -526,19 +510,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:48 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 8dc8c3f723eef..ba092a2792a08 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -356,16 +356,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -384,7 +377,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:14 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -604,16 +596,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -632,7 +617,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:37 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -852,16 +836,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -880,7 +857,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:02:00 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
index 04450f6526029..6e2a98a4df712 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError-with-incremental.js
@@ -174,8 +174,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -235,33 +233,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -403,12 +379,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -416,7 +389,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -540,8 +512,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -599,17 +569,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -722,8 +686,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
index c06900663a077..6ce359f78c7bf 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/assumeChangesOnlyAffectDirectDependenciesAndD/with-noEmitOnError.js
@@ -174,8 +174,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -235,33 +233,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -403,12 +379,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -416,7 +389,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -540,8 +512,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -599,17 +569,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -722,8 +686,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
index a9adc01739724..4b76ba3f74523 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,14 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -181,14 +175,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -196,8 +185,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:40 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -333,18 +320,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -468,14 +448,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -483,8 +458,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:02 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
index 14141643f1bbb..6b6265e4062da 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/deepImportChanges/errors-for-.ts-change.js
@@ -200,15 +200,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -216,7 +210,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:53 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -362,17 +355,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:10 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -508,14 +495,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -523,7 +505,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:27 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 6b17086fc49d7..0bd997cf7d85b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -325,20 +325,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:07 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -506,14 +497,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -532,7 +518,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:24 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -743,17 +728,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:41 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
index a8a79d5331b90..194267bbfe50b 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError-with-incremental.js
@@ -178,8 +178,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -239,27 +237,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -385,12 +367,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -398,7 +377,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -520,8 +498,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -579,16 +555,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -698,8 +669,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
index 5d757c9ff666b..ce00016b8efec 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/default/with-noEmitOnError.js
@@ -178,8 +178,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -239,27 +237,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -385,12 +367,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -398,7 +377,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -520,8 +498,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -579,16 +555,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -698,8 +669,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
index 02a69a4b949ce..a8dc692ec8683 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,16 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -187,16 +179,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -204,8 +189,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:45 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -342,20 +325,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -480,16 +454,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -497,8 +464,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:13 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
index 404c159553e53..da962daca7abb 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/deepImportChanges/errors-for-.ts-change.js
@@ -217,17 +217,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -235,7 +227,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:05 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -391,20 +382,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:12 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:31 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -548,17 +530,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -566,7 +540,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:57 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index edfc5817c9add..932f6e6d7b252 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -355,21 +355,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -549,18 +539,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -579,7 +560,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:49 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -804,21 +784,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:02:18 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
index 9b8c6f9dae650..d0a4d0f318392 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError-with-incremental.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,33 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -401,12 +377,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -414,7 +387,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -537,8 +509,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -596,17 +566,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -718,8 +682,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
index 45751dc922034..d8a4f56d04260 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/defaultAndD/with-noEmitOnError.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,33 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -401,12 +377,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -414,7 +387,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -537,8 +509,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -596,17 +566,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -718,8 +682,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
index 415be8cbf8d7c..2fcab61a09b4e 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,14 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -181,14 +175,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -196,8 +185,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:40 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -333,18 +320,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:47 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:51 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -468,14 +448,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -483,8 +458,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:02 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
index 84163b27c9ad1..26cd3ba63c1ae 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/deepImportChanges/errors-for-.ts-change.js
@@ -200,13 +200,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -214,7 +210,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:47 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -361,16 +356,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -505,13 +495,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -519,7 +505,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:15 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 47e8cb014d611..1ce4cd7ddf0e6 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -325,16 +325,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:55 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -501,13 +496,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -526,7 +517,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:09 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -738,16 +728,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:23 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
index 5487cd16f8c0b..653445b31864a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -172,8 +172,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -233,27 +231,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -379,12 +361,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -392,7 +371,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -514,8 +492,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -573,16 +549,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -692,8 +663,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
index bdc2748c42373..989ae3dbbb1ca 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModules/with-noEmitOnError.js
@@ -172,8 +172,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -233,27 +231,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -379,12 +361,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -392,7 +371,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -514,8 +492,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -573,16 +549,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -692,8 +663,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
index 787aa270209c2..acd5004cc0b66 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,16 +40,8 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -187,16 +179,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -204,8 +189,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:00:45 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -342,20 +325,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
@@ -480,16 +454,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:01:06 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -497,8 +464,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:13 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.d.ts","/user/username/projects/myproject/c.d.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
index fbde7ff089812..b15e1527acddc 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -217,16 +217,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -234,7 +227,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:02 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -389,19 +381,11 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:09 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:25 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
@@ -544,16 +528,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -561,7 +538,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:48 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 19a3b54610edd..b635367da4bad 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -355,21 +355,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:58 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -551,18 +541,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:27 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -581,7 +562,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 chang
 
 [12:01:49 AM] Found 2 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
@@ -808,21 +788,11 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:56 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:02:18 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/a.ts","/user/username/projects/myproject/b.ts","/user/username/projects/myproject/c.ts","/user/username/projects/myproject/d.ts","/user/username/projects/myproject/e.ts"]
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index adffac996df20..8a2fffaedd3e0 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,33 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -401,12 +377,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -414,7 +387,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -537,8 +509,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -596,17 +566,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -718,8 +682,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
index 39499bedd8dd7..bed1bc6d9d617 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/incremental/isolatedModulesAndD/with-noEmitOnError.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,33 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -401,12 +377,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -414,7 +387,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -537,8 +509,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -596,17 +566,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -718,8 +682,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
index 4c9137b412ea7..e10259bdb7999 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,8 +40,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:28 AM] Found 0 errors. Watching for file changes.
 
 
@@ -111,9 +109,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
@@ -181,9 +176,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
@@ -246,9 +238,6 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
index b13d120ad6507..77efd91c3c423 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/deepImportChanges/errors-for-.ts-change.js
@@ -134,12 +134,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -215,12 +212,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -291,12 +285,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 23ec4494fa2f3..40a113914a8b5 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -184,12 +184,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 
@@ -262,12 +259,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:52 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -356,12 +350,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:00 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
index effe08a727e64..2c894c145b09a 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError-with-incremental.js
@@ -172,8 +172,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -233,27 +231,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:06 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -379,12 +361,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -392,7 +371,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:17 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -514,8 +492,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -573,16 +549,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:37 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -692,8 +663,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
index 00d9bfbcc6f31..a0bbf83e0dc85 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModules/with-noEmitOnError.js
@@ -97,8 +97,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -158,25 +156,9 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:00:58 AM] Found 0 errors. Watching for file changes.
 
 
@@ -247,8 +229,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:02 AM] File change detected. Starting incremental compilation...
 
@@ -305,8 +285,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -364,12 +342,9 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:13 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
 [12:01:17 AM] Found 0 errors. Watching for file changes.
 
 
@@ -424,8 +399,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:21 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
index fd82ee72294b1..618fe53144a13 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.d.ts-change.js
@@ -40,10 +40,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -117,14 +113,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -190,14 +181,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
@@ -258,14 +244,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
index f802f56f1c48b..dd21b663f9d48 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/deepImportChanges/errors-for-.ts-change.js
@@ -151,15 +151,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
@@ -243,15 +237,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:00:59 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
 
@@ -330,15 +318,9 @@ export class C
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.ts
-
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
 a.ts:4:17 - error TS2339: Property 'd' does not exist on type 'C'.
 
 4 console.log(b.c.d);
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
index 9514448be65e7..08665de0850ed 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/file-not-exporting-a-deep-multilevel-import-that-changes.js
@@ -214,17 +214,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:01:13 AM] Found 0 errors. Watching for file changes.
 
 
@@ -312,17 +304,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:17 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 c.ts:6:13 - error TS2322: Type '{ x: number; y: number; }' is not assignable to type 'Coords'.
   Object literal may only specify known properties, and 'x' does not exist in type 'Coords'.
 
@@ -426,17 +410,9 @@ export interface Coords {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:01:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: c.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: d.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: e.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.d.ts
 [12:01:59 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
index 53e409de7fde5..9e681e6599665 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError-with-incremental.js
@@ -173,8 +173,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
@@ -234,33 +232,11 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:48 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:12 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -401,12 +377,9 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 src/main.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const a: string = 10;
@@ -414,7 +387,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 c
 
 [12:01:23 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -537,8 +509,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:31 AM] File change detected. Starting incremental compilation...
 
@@ -596,17 +566,11 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo
 [12:01:46 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/noEmitOnError/shared/types/db.ts","/user/username/projects/noEmitOnError/src/main.ts","/user/username/projects/noEmitOnError/src/other.ts"]
@@ -718,8 +682,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
index 66b5a94ca600a..34f7d03b64896 100644
--- a/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
+++ b/tests/baselines/reference/tscWatch/emitAndErrorUpdates/isolatedModulesAndD/with-noEmitOnError.js
@@ -97,8 +97,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
@@ -158,31 +156,9 @@ const a = {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/shared/types/db.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/shared/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/main.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 rename:: dev-build/src/other.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src
 [12:01:04 AM] Found 0 errors. Watching for file changes.
 
 
@@ -267,8 +243,6 @@ const a: string = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -325,8 +299,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:14 AM] File change detected. Starting incremental compilation...
 
@@ -384,13 +356,9 @@ const a: string = "hello";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:19 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: dev-build/src/main.d.ts
 [12:01:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -446,8 +414,6 @@ Input::
 //// [/user/username/projects/noEmitOnError/src/main.ts] file written with same contents
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/noemitonerror 1 change:: src/main.ts
-
 >> Screen clear
 [12:01:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
index fd59c5990215f..dec29649773ce 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-lowercase.js
@@ -115,13 +115,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.ts
-
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: b.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 project/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
index 0b28da762ec06..4503d40a300d3 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-Windows-style-drive-root-is-uppercase.js
@@ -115,13 +115,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.ts
-
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: c:/project 1 change:: b.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 project/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
index 8fcebef95b7ab..d2f27653bed2a 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-directory-symlink-target-and-import-match-disk.js
@@ -143,12 +143,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
index 1cb178832b5ef..9670b01db257f 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-both-file-symlink-target-and-import-match-disk.js
@@ -131,13 +131,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
index 77774ae652950..9d715495c3c4a 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-changing-module-name-with-different-casing.js
@@ -97,12 +97,9 @@ import { logger } from "./Logger"; new logger();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: another.ts
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: another.js
 user/username/projects/myproject/another.ts:1:24 - error TS1261: Already included file name '/user/username/projects/myproject/Logger.ts' differs from file name '/user/username/projects/myproject/logger.ts' only in casing.
   The file is in the program because:
     Imported via "./Logger" from file '/user/username/projects/myproject/another.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
index cc3f543daafd8..b34869681bb6c 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-directory-symlink-target-matches-disk-but-import-does-not.js
@@ -143,12 +143,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY/a.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
index d652c222335c8..61a08b485eff8 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-file-symlink-target-matches-disk-but-import-does-not.js
@@ -131,13 +131,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 ../../../../a/lib/lib.d.ts
   Default library for target 'es3'
 XY.ts
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
index a03d7beee386a..e54490bf6694b 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-directory-symlink-target,-and-disk-are-all-different.js
@@ -149,12 +149,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 b.ts:2:19 - error TS2792: Cannot find module './yX/a'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 2 import { a } from "./yX/a";
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
index 4e8d9102a6b0d..c42e49cc01c79 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import,-file-symlink-target,-and-disk-are-all-different.js
@@ -36,12 +36,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: XY.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: link.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 b.ts:2:19 - error TS2307: Cannot find module './yX' or its corresponding type declarations.
 
 2 import { a } from "./yX";
@@ -145,14 +139,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
 b.ts:2:19 - error TS2307: Cannot find module './yX' or its corresponding type declarations.
 
 2 import { a } from "./yX";
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
index a7a3d48e40fc2..23a93128bab68 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-directory-symlink-target-agree-but-do-not-match-disk.js
@@ -151,12 +151,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
   The file is in the program because:
     Imported via "./Xy/a" from file '/user/username/projects/myproject/b.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
index cc6ae7be49c20..dd0ca380d9f3e 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-and-file-symlink-target-agree-but-do-not-match-disk.js
@@ -139,13 +139,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 b.ts:2:19 - error TS1149: File name '/user/username/projects/myproject/Xy.ts' differs from already included file name '/user/username/projects/myproject/XY.ts' only in casing.
   The file is in the program because:
     Matched by default include pattern '**/*'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
index d4c7b75e3583c..b80e2134bce4b 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-directory-symlink-target-does-not.js
@@ -151,12 +151,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY/a.ts
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: out.js
 b.ts:2:19 - error TS1261: Already included file name '/user/username/projects/myproject/Xy/a.ts' differs from file name '/user/username/projects/myproject/XY/a.ts' only in casing.
   The file is in the program because:
     Imported via "./Xy/a" from file '/user/username/projects/myproject/b.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
index 0c6cbe0e17602..c97de6ce4280b 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-import-matches-disk-but-file-symlink-target-does-not.js
@@ -139,13 +139,9 @@ export const b = 2;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: XY.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 b.ts:2:19 - error TS1149: File name '/user/username/projects/myproject/Xy.ts' differs from already included file name '/user/username/projects/myproject/XY.ts' only in casing.
   The file is in the program because:
     Matched by default include pattern '**/*'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
index e696b1e3b441b..8478461feaac8 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-relative-information-file-location-changes.js
@@ -142,12 +142,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: moduleA.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: moduleA.js
 moduleA.ts:2:40 - error TS1261: Already included file name '/user/username/projects/myproject/ModuleC.ts' differs from file name '/user/username/projects/myproject/moduleC.ts' only in casing.
   The file is in the program because:
     Imported via "./ModuleC" from file '/user/username/projects/myproject/moduleA.ts'
diff --git a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
index ba1320e8cec68..92a7dcac194b7 100644
--- a/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
+++ b/tests/baselines/reference/tscWatch/forceConsistentCasingInFileNames/when-renaming-file-with-different-casing.js
@@ -95,11 +95,6 @@ Input::
 //// [/user/username/projects/myproject/Logger.ts] file was renamed from file /user/username/projects/myproject/logger.ts
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: logger.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: Logger.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
index 16fd7a70eb79d..f97d3a05fb12e 100644
--- a/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/editing-module-augmentation-watch.js
@@ -32,8 +32,6 @@ Output::
 >> Screen clear
 [12:00:33 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /users/username/projects/project/src 1 rename:: index.js
-sysLog:: watchPresentFileSystemEntry:: /users/username/projects/project/src 1 change:: 
 [12:00:38 AM] Found 0 errors. Watching for file changes.
 
 
@@ -178,7 +176,6 @@ Output::
 >> Screen clear
 [12:00:44 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /users/username/projects/project/src 1 change:: index.js
 src/index.ts:1:51 - error TS2339: Property 'foo' does not exist on type 'Result'.
 
 1 import classNames from "classnames"; classNames().foo;
diff --git a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
index c9009919cbd8d..8ab4f71d85f61 100644
--- a/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
+++ b/tests/baselines/reference/tscWatch/moduleResolution/watches-for-changes-to-package-json-main-fields.js
@@ -153,8 +153,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg2 1 change:: package.json
-
 >> Screen clear
 [12:00:53 AM] File change detected. Starting incremental compilation...
 
@@ -182,7 +180,6 @@ File '/user/username/projects/myproject/node_modules/pkg2/build/other.tsx' does
 File '/user/username/projects/myproject/node_modules/pkg2/build/other.d.ts' exist - use it as a name resolution result.
 Resolving real path for '/user/username/projects/myproject/node_modules/pkg2/build/other.d.ts', result '/user/username/projects/myproject/packages/pkg2/build/other.d.ts'.
 ======== Module name 'pkg2' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/other.d.ts' with Package ID 'pkg2/build/other.d.ts@1.0.0'. ========
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 packages/pkg1/index.ts:1:15 - error TS2305: Module '"pkg2"' has no exported member 'TheNum'.
 
 1 import type { TheNum } from 'pkg2'
@@ -288,7 +285,6 @@ File '/user/username/projects/myproject/packages/pkg2/build/const.ts' does not e
 File '/user/username/projects/myproject/packages/pkg2/build/const.tsx' does not exist.
 File '/user/username/projects/myproject/packages/pkg2/build/const.d.ts' exist - use it as a name resolution result.
 ======== Module name './const.js' was successfully resolved to '/user/username/projects/myproject/packages/pkg2/build/const.d.ts'. ========
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/packages/pkg1 1 change:: build/index.js
 [12:01:05 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js
index 0c1b4d730ed84..5ec25f7fcfe83 100644
--- a/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
+++ b/tests/baselines/reference/tscWatch/nodenext watch emit/esm-mode-file-is-edited.js	
@@ -99,8 +99,6 @@ Thing.fn();
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /project 1 change:: src/index.ts
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
index 39756910bb7c8..15a3e8bd3fa82 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Options-Diagnostic-locations-reported-correctly-with-changes-in-configFile-contents-when-options-change.js
@@ -101,8 +101,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
index 269eb38c46f33..65462ae84baab 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Reports-errors-when-the-config-file-changes.js
@@ -78,8 +78,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
@@ -133,8 +131,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
index 30b1cb0e0312c..4f47cd5f54f3c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/Updates-diagnostics-when-'--noUnusedLabels'-changes.js
@@ -72,8 +72,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
@@ -124,8 +122,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:23 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
index 66d242d647884..22d57ffd06393 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-new-files-to-a-configured-program-without-file-list.js
@@ -74,15 +74,9 @@ let y = 1
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 [12:00:27 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
index f5635e360db3c..9be0097c5bedf 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/add-the-missing-module-file-for-inferred-project-should-remove-the-module-not-found-error.js
@@ -21,8 +21,6 @@ Output::
 >> Screen clear
 [12:00:13 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/file1.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
 a/b/file1.ts:1:20 - error TS2307: Cannot find module './moduleFile' or its corresponding type declarations.
 
 1 import * as T from "./moduleFile"; T.bar();
@@ -77,9 +75,6 @@ export function bar() { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/moduleFile.ts
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
-
 >> Screen clear
 [12:00:19 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
index 3d5c9ba773fd5..4ef78e41a9881 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-(new-file-on-disk).js
@@ -74,15 +74,9 @@ let y = 1
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: f2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:21 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: f2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
 [12:00:27 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
index 58860e5eb1776..48b958db8510f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/can-correctly-update-configured-project-when-set-of-root-files-has-changed-through-include.js
@@ -79,14 +79,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 rename:: file2.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 change:: 
-
 >> Screen clear
 [12:00:29 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 rename:: file2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
index 1875f9e0907dc..1d1e3a97eda54 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/change-module-to-none.js
@@ -76,12 +76,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: f1.js
 a/b/f1.ts:1:1 - error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
 
 1 export {}
diff --git a/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js b/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
index 9fcee78a9ddbd..8ce89bda343d1 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/config-file-is-deleted.js
@@ -84,8 +84,6 @@ Input::
 //// [/a/b/tsconfig.json] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
 error TS5083: Cannot read file '/a/b/tsconfig.json'.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
index caef1045d34e2..c5b9c128afc0b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/correctly-handles-changes-in-lib-section-of-config-file.js
@@ -83,12 +83,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /src 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:22 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /src 1 change:: app.js
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js b/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js
index 9cd745bbb46b9..4cc9a64e0e993 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/correctly-parses-wild-card-directories-from-implicit-glob-when-two-keys-differ-only-in-directory-seperator.js
@@ -153,11 +153,9 @@ export const z = 1;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: new-file.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 Reloading new file names and options
 Synchronizing program
 [12:00:39 AM] File change detected. Starting incremental compilation...
@@ -166,20 +164,14 @@ CreatingProgramWith::
   roots: ["/user/username/projects/myproject/f1.ts","/user/username/projects/myproject/f2.ts","/user/username/projects/myproject/new-file.ts"]
   options: {"composite":true,"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/new-file.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: new-file.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.js :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/new-file.js
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.js :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: new-file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected output file: /user/username/projects/myproject/new-file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/new-file.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:00:47 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/f1.ts","/user/username/projects/myproject/f2.ts","/user/username/projects/myproject/new-file.ts"]
@@ -289,19 +281,14 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/f1.ts 1:: WatchInfo: /user/username/projects/myproject/f1.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/f1.ts 1:: WatchInfo: /user/username/projects/myproject/f1.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: f1.ts
 Synchronizing program
 [12:00:53 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/f1.ts","/user/username/projects/myproject/f2.ts","/user/username/projects/myproject/new-file.ts"]
   options: {"composite":true,"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: f1.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: f1.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo
 [12:01:03 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/f1.ts","/user/username/projects/myproject/f2.ts","/user/username/projects/myproject/new-file.ts"]
diff --git a/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
index d6c7a106c6db5..c24a8fc88e321 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/create-watch-without-config-file.js
@@ -27,8 +27,6 @@ Output::
 >> Screen clear
 [12:00:17 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/c/app.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/c
 a/b/c/app.ts:2:25 - error TS2305: Module '"./module"' has no exported member 'f'.
 
 2                 import {f} from "./module"
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
index 0a759aac1e818..a10797617e9a4 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure-2.js
@@ -125,7 +125,6 @@ Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/f1.js
 a/b/f1.ts:1:15 - error TS7016: Could not find a declaration file for module './f2'. '/a/b/f2.js' implicitly has an 'any' type.
 
 1 export * from "./f2"
diff --git a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
index cdf207a5bbbed..233d8635a3ebe 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/deleted-files-affect-project-structure.js
@@ -125,7 +125,6 @@ Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/f1.js
 a/b/f1.ts:1:15 - error TS7016: Could not find a declaration file for module './f2'. '/a/b/f2.js' implicitly has an 'any' type.
 
 1 export * from "./f2"
diff --git a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
index c5357521539e3..1dd28f2ed0021 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
@@ -92,13 +92,9 @@ let y = 1;let xy = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.ts
-
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 a/b/commonFile1.ts
@@ -159,13 +155,9 @@ Input::
 //// [/a/b/commonFile2.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 a/b/commonFile1.ts
@@ -215,14 +207,9 @@ let y = 1
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: commonFile2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
 a/lib/lib.d.ts
   Default library for target 'es3'
 a/b/commonFile1.ts
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
index 72aa414b481b3..f44279fbd6495 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-configured-projects.js
@@ -96,22 +96,9 @@ export function bar() { };
 //// [/a/b/moduleFile.js] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
 a/b/file1.ts:1:20 - error TS2307: Cannot find module './moduleFile' or its corresponding type declarations.
 
 1 import * as T from "./moduleFile"; T.bar();
@@ -181,21 +168,9 @@ export function bar() { };
 //// [/a/b/moduleFile1.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 rename:: moduleFile.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
 [12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
index 31fbce47cdc2e..af64ecde0727f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/rename-a-module-file-and-rename-back-should-restore-the-states-for-inferred-projects.js
@@ -90,7 +90,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b/file1.js
 a/b/file1.ts:1:20 - error TS2307: Cannot find module './moduleFile' or its corresponding type declarations.
 
 1 import * as T from "./moduleFile"; T.bar();
@@ -138,11 +137,6 @@ export function bar() { };
 //// [/a/b/moduleFile1.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/moduleFile1.ts
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: b/moduleFile.ts
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: b
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
index 134197ee82e55..4166f16b7541b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-file-not-in-rootDir.js
@@ -97,12 +97,9 @@ import { x } from "../b";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: lib/a.js
 a.ts:3:19 - error TS6059: File '/user/username/projects/b.ts' is not under 'rootDir' '/user/username/projects/myproject'. 'rootDir' is expected to contain all source files.
 
 3 import { x } from "../b";
diff --git a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
index 8a219eb58dac9..ef020d04628d3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/reports-errors-correctly-with-isolatedModules.js
@@ -93,12 +93,9 @@ export const a: number = 1
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.ts
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 b.ts:2:7 - error TS2322: Type 'number' is not assignable to type 'string'.
 
 2 const b: string = a;
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
index ea3e7d8a79e4b..e3fc789404c06 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/declarationDir-is-specified.js
@@ -130,8 +130,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
@@ -264,20 +262,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: decls/src/file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: decls/src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
index ffbe73076dae4..620c42fa2a32c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-and-declarationDir-is-specified.js
@@ -262,18 +262,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: build/src/file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: build/src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: decls/src/file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: decls/src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
index ac766fcc23d15..6800711e1a42f 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/when-outDir-is-specified.js
@@ -254,16 +254,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: build/src/file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: build/src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
index 9bb0fde4fd3d9..7b96140fceb23 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/with-outFile.js
@@ -249,15 +249,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: build/outFile.js
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
index f63f2b5bcd268..1b21f2ca83fcc 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified-with-declaration-enabled.js
@@ -130,10 +130,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
@@ -266,22 +262,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
index 8aac3f60d10db..1b80ab46e46ad 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-not-trigger-recompilation-because-of-program-emit/without-outDir-or-outFile-is-specified.js
@@ -130,8 +130,6 @@ Output::
 >> Screen clear
 [12:00:25 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
@@ -256,18 +254,9 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: src/file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
 error TS2318: Cannot find global type 'Array'.
 
 error TS2318: Cannot find global type 'Boolean'.
diff --git a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
index c61858b2e2a6c..f379dda653e4b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/should-properly-handle-module-resolution-changes-in-config-file.js
@@ -101,7 +101,6 @@ Output::
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: file1.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
index 44fe5e4d0d401..d6571f1f2e3e3 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-for-decorators.js
@@ -112,8 +112,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:23 AM] File change detected. Starting incremental compilation...
 
@@ -168,13 +166,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry::  1 change:: b.js
-sysLog:: watchPresentFileSystemEntry::  1 change:: a.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
index 6e93c7990902a..b95366558d2e8 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-diagnostics-and-emit-when-useDefineForClassFields-changes.js
@@ -86,12 +86,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:20 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry::  1 change:: a.js
 a.ts:2:21 - error TS2610: 'prop' is defined as an accessor in class 'C', but is overridden here in 'D' as an instance property.
 
 2 class D extends C { prop = 1; }
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
index 847c3c7b569e2..d49eea56c629a 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-emit-on-jsx-option-change.js
@@ -75,13 +75,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
index 0753cecb7b8ac..c29e44a58d755 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-and-emit-when-importsNotUsedAsValues-changes.js
@@ -99,13 +99,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
@@ -156,13 +152,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:43 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 b.ts:1:1 - error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
 
 1 import {C} from './a';
@@ -226,13 +218,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:54 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.js
 [12:01:01 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
index 715cf188f0664..9412986369c3c 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-correctly-when-declaration-emit-is-disabled-in-compiler-options.js
@@ -85,8 +85,6 @@ export default test;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
@@ -147,8 +145,6 @@ export default test;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
@@ -204,8 +200,6 @@ export default test;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
@@ -271,8 +265,6 @@ export default test;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: b.ts
-
 >> Screen clear
 [12:00:44 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
index f67d6d31917e5..ce71c8e888fa1 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-ambient-modules-of-program-changes.js
@@ -77,15 +77,9 @@ declare module 'a' {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 a.ts:2:8 - error TS2300: Duplicate identifier 'foo'.
 
 2   type foo = number;
@@ -159,13 +153,9 @@ Input::
 //// [/user/username/projects/myproject/b.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: b.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
index a26275602e707..2bbd474f5792b 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-forceConsistentCasingInFileNames-changes.js
@@ -93,8 +93,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry::  1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
index d502751b50f3b..e8849a90830dc 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-noErrorTruncation-changes.js
@@ -88,8 +88,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
index 81b8bb6b4644e..80b6a9c592175 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-errors-when-strictNullChecks-changes.js
@@ -75,8 +75,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
@@ -129,8 +127,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:33 AM] File change detected. Starting incremental compilation...
 
@@ -183,8 +179,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
index d37446191d686..410db4b1367bf 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/updates-moduleResolution-when-resolveJsonModule-changes.js
@@ -27,8 +27,6 @@ Output::
 >> Screen clear
 [12:00:23 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 a.ts:1:23 - error TS2732: Cannot find module './data.json'. Consider using '--resolveJsonModule' to import module with '.json' extension.
 
 1 import * as data from './data.json'
@@ -89,14 +87,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: a.js
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js b/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
index 37336d2bd5d0f..6cf84cd6877f2 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/watched-files-when-file-is-deleted-and-new-file-is-added-as-part-of-change.js
@@ -75,16 +75,9 @@ var a = 10;
 //// [/home/username/project/src/file1.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 rename:: src/file1.ts
-sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 change:: src
-sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 rename:: src/file2.ts
-sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 change:: src
-
 >> Screen clear
 [12:00:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 rename:: src/file2.js
-sysLog:: watchPresentFileSystemEntry:: /home/username/project 1 change:: src
 [12:00:31 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js b/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
index baaba896465c3..2c6d1ff7e912d 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-creating-extensionless-file.js
@@ -84,11 +84,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 Reloading new file names and options
 Synchronizing program
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
index 7ff8a428bca12..27c0214047124 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-creating-new-file-in-symlinked-folder.js
@@ -112,11 +112,9 @@ import * as M from "folder1/module1";
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 rename:: module3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.ts :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.ts :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 change:: 
 Reloading new file names and options
 Synchronizing program
 [12:00:41 AM] File change detected. Starting incremental compilation...
@@ -125,11 +123,9 @@ CreatingProgramWith::
   roots: ["/user/username/projects/myproject/client/folder1/module1.ts","/user/username/projects/myproject/client/linktofolder2/module2.ts","/user/username/projects/myproject/client/linktofolder2/module3.ts"]
   options: {"baseUrl":"/user/username/projects/myproject/client","paths":{"*":["*"]},"pathsBasePath":"/user/username/projects/myproject","watch":true,"project":"/user/username/projects/myproject","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/client/linktofolder2/module3.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 rename:: module3.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.js :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/folder2/module3.js
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/folder2/module3.js :: WatchInfo: /user/username/projects/myproject/folder2 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/folder2 1 change:: 
 [12:00:45 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
index 88a0ed0a9447c..56df7dd17e823 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-new-file-is-added-to-the-referenced-project.js
@@ -168,11 +168,9 @@ class class3 {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 Reloading new file names and options
 [12:00:45 AM] File change detected. Starting incremental compilation...
@@ -250,11 +248,9 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
@@ -263,12 +259,8 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"watch":true,"project":"/user/username/projects/myproject/projects/project2/tsconfig.json","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -381,16 +373,12 @@ declare class file {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp/file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: temp
 
 
 WatchedFiles::
@@ -433,11 +421,9 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -447,9 +433,6 @@ CreatingProgramWith::
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 error TS6053: File '/user/username/projects/myproject/projects/project1/class3.d.ts' not found.
   The file is in the program because:
     Output from referenced project '/user/username/projects/myproject/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
@@ -461,7 +444,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project
 
 [12:01:18 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -565,11 +547,9 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -578,12 +558,8 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"watch":true,"project":"/user/username/projects/myproject/projects/project2/tsconfig.json","extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:01:35 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
diff --git a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
index 4ae590d53c6a5..4b564de1611fd 100644
--- a/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
+++ b/tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
@@ -103,8 +103,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
@@ -160,8 +158,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:35 AM] File change detected. Starting incremental compilation...
 
@@ -222,8 +218,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
@@ -288,8 +282,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:46 AM] File change detected. Starting incremental compilation...
 
@@ -349,8 +341,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:51 AM] File change detected. Starting incremental compilation...
 
@@ -406,8 +396,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: tsconfig.json
-
 >> Screen clear
 [12:00:56 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
index 8116d53563f09..82a4e297d8331 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-sample-project.js
@@ -536,13 +536,6 @@ function foo() { }
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-
 >> Screen clear
 [12:01:32 AM] File change detected. Starting incremental compilation...
 
@@ -725,13 +718,6 @@ export declare function gfoo(): void;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js.map
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-
 >> Screen clear
 [12:01:51 AM] File change detected. Starting incremental compilation...
 
@@ -991,15 +977,6 @@ export declare function gfoo(): void;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: decls
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 rename:: decls/index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: decls
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/sample1/logic 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-
 >> Screen clear
 [12:02:22 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
index 7828d8cdf1a5c..f78e22fda1784 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
@@ -346,21 +346,9 @@ export declare function gfoo(): void;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
 
@@ -458,15 +446,9 @@ export class A {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 rename:: nrefs
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: nrefs
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: tsconfig.json
-
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:01:32 AM] Found 0 errors. Watching for file changes.
 
 
@@ -563,12 +545,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: tsconfig.json
-
 >> Screen clear
 [12:01:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:01:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -665,9 +644,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
@@ -763,9 +739,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:01:50 AM] File change detected. Starting incremental compilation...
 
@@ -848,17 +821,9 @@ Input::
 //// [/user/username/projects/transitiveReferences/b/tsconfig.json] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/b 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 c/tsconfig.json:1:84 - error TS6053: File '/user/username/projects/transitiveReferences/b' not found.
 
 1 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"references":[{"path":"../b"}]}
@@ -944,14 +909,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
-
 >> Screen clear
 [12:02:03 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/c 1 change:: index.js
 [12:02:07 AM] Found 0 errors. Watching for file changes.
 
 
@@ -1046,16 +1006,9 @@ Input::
 //// [/user/username/projects/transitiveReferences/a/tsconfig.json] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/a 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitivereferences/a 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
-
 >> Screen clear
 [12:02:09 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: index.js
 b/tsconfig.json:1:96 - error TS6053: File '/user/username/projects/transitiveReferences/a' not found.
 
 1 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"references":[{"path":"../a"}]}
@@ -1152,10 +1105,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
-
 >> Screen clear
 [12:02:17 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
index 82edc629807b8..1deb26f2868c5 100644
--- a/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
+++ b/tests/baselines/reference/tscWatch/projectsWithReferences/on-transitive-references-in-different-folders.js
@@ -342,12 +342,6 @@ export declare function gfoo(): void;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
-
 >> Screen clear
 [12:01:16 AM] File change detected. Starting incremental compilation...
 
@@ -444,10 +438,6 @@ export class A {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 rename:: nrefs
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: nrefs
-
 >> Screen clear
 [12:01:28 AM] File change detected. Starting incremental compilation...
 
@@ -638,8 +628,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:01:44 AM] File change detected. Starting incremental compilation...
 
@@ -730,8 +718,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: tsconfig.json
-
 >> Screen clear
 [12:01:50 AM] File change detected. Starting incremental compilation...
 
@@ -809,14 +795,9 @@ Input::
 //// [/user/username/projects/transitiveReferences/b/tsconfig.json] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
-
 >> Screen clear
 [12:01:53 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: index.js
 c/tsconfig.json:1:105 - error TS6053: File '/user/username/projects/transitiveReferences/b' not found.
 
 1 {"compilerOptions":{"baseUrl":"./","paths":{"@ref/*":["../refs/*"]}},"files":["index.ts"],"references":[{"path":"../b"}]}
@@ -900,10 +881,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: b
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/b 1 change:: 
-
 >> Screen clear
 [12:02:03 AM] File change detected. Starting incremental compilation...
 
@@ -997,14 +974,9 @@ Input::
 //// [/user/username/projects/transitiveReferences/a/tsconfig.json] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
-
 >> Screen clear
 [12:02:09 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: index.js
 b/tsconfig.json:1:117 - error TS6053: File '/user/username/projects/transitiveReferences/a' not found.
 
 1 {"compilerOptions":{"composite":true,"baseUrl":"./","paths":{"@ref/*":["../*"]}},"files":["index.ts"],"references":[{"path":"../a"}]}
@@ -1098,10 +1070,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 rename:: tsconfig.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences 1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/transitiveReferences/a 1 change:: 
-
 >> Screen clear
 [12:02:17 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
index 5a8350b7b0b53..ec5ba33068815 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/caching-works.js
@@ -24,10 +24,6 @@ Output::
 >> Screen clear
 [12:00:15 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: f1.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: d/f0.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d
 a/d/f0.ts:1:17 - error TS2306: File '/a/f1.ts' is not a module.
 
 1 import {x} from "f1"
@@ -97,12 +93,9 @@ import {x} from "f1"
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.ts
-
 >> Screen clear
 [12:00:24 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.js
 a/d/f0.ts:1:17 - error TS2306: File '/a/f1.ts' is not a module.
 
 1 import {x} from "f1"
@@ -169,12 +162,9 @@ import {x} from "f2"
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.ts
-
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.js
 a/d/f0.ts:1:17 - error TS2792: Cannot find module 'f2'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 1 import {x} from "f2"
@@ -231,13 +221,9 @@ import {x} from "f1"
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.ts
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: f1.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: d/f0.js
 a/d/f0.ts:1:17 - error TS2306: File '/a/f1.ts' is not a module.
 
 1 import {x} from "f1"
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
index 8711b2767ab29..4983e21f361fc 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-with-configFile.js
@@ -87,19 +87,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: .cache
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/.cache
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: .cache/babel-loader
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/.cache/babel-loader
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: .cache
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/.cache
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: .cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: .cache/babel-loader
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/.cache/babel-loader
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
index 25ea2f7ce25cd..85f14d17a90e3 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/ignores-changes-in-node_modules-that-start-with-dot/watch-without-configFile.js
@@ -27,8 +27,6 @@ Output::
 >> Screen clear
 [12:00:27 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/test.js
-sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject
 [12:00:30 AM] Found 0 errors. Watching for file changes.
 
 
@@ -83,13 +81,6 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/node_modules/.cache
-sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject/node_modules
-sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/node_modules/.cache/babel-loader
-sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject/node_modules/.cache
-sysLog:: watchPresentFileSystemEntry:: /user 1 rename:: username/projects/myproject/node_modules/.cache/babel-loader/89c02171edab901b9926470ba6d5677e.ts
-sysLog:: watchPresentFileSystemEntry:: /user 1 change:: username/projects/myproject/node_modules/.cache/babel-loader
-
 
 WatchedFiles::
 /user/username/projects/myproject/test.ts:
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
index 26781409f1eb0..fe2afcf3739ba 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/loads-missing-files-from-disk.js
@@ -21,9 +21,6 @@ Output::
 >> Screen clear
 [12:00:11 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: foo.js
-sysLog:: watchPresentFileSystemEntry::  1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
 a/foo.ts:1:17 - error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 1 import {x} from "bar"
@@ -85,15 +82,9 @@ export const y = 1;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.ts
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: bar.d.ts
-sysLog:: watchPresentFileSystemEntry::  1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
-
 >> Screen clear
 [12:00:20 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.js
 [12:00:24 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
index c76354103ea07..a7a69e9bbf8fb 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/should-compile-correctly-when-resolved-module-goes-missing-and-then-comes-back.js
@@ -24,8 +24,6 @@ Output::
 >> Screen clear
 [12:00:13 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: foo.js
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
 [12:00:16 AM] Found 0 errors. Watching for file changes.
 
 
@@ -78,13 +76,9 @@ Input::
 //// [/a/bar.d.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: bar.d.ts
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
-
 >> Screen clear
 [12:00:18 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.js
 a/foo.ts:1:17 - error TS2792: Cannot find module 'bar'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?
 
 1 import {x} from "bar"
@@ -135,14 +129,9 @@ export const y = 1;export const x = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a 1 rename:: bar.d.ts
-sysLog:: watchPresentFileSystemEntry::  1 change:: a
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: 
-
 >> Screen clear
 [12:00:25 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a 1 change:: foo.js
 [12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
index e967c45ba9ff9..e1320878fe8ab 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/when-types-in-compiler-option-are-global-and-installed-at-later-point.js
@@ -87,37 +87,11 @@ declare namespace myapp {
 
 
 Output::
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/node_modules 1 /user/username/projects/myproject/node_modules:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types/package.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types/package.json
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp/ts-types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp/ts-types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp/ts-types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp/ts-types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @myapp/ts-types/types/somefile.define.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@myapp/ts-types/types/somefile.define.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @myapp/ts-types/types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@myapp/ts-types/types
 
 >> Screen clear
 [12:00:39 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: lib/app.js
 [12:00:43 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
index 5692c7f704e20..4f41981f7b4e6 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-installing-something-in-node_modules-or-@types-when-there-is-no-notification-from-fs-for-index-file.js
@@ -138,124 +138,83 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/base.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/base.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/globals.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/globals.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/globals.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/globals.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/index.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/index.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 2:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/ts3.6/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/ts3.6/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/ts3.6/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node/ts3.6
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node/ts3.6
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node/ts3.6
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/node_modules/@types/node/ts3.6
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: 
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
 Reloading new file names and options
 Synchronizing program
 [12:00:48 AM] File change detected. Starting incremental compilation...
@@ -268,7 +227,6 @@ FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/base.d.ts 250 undefined Source file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/index.d.ts 250 undefined Source file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/package.json 2000 undefined package.json file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: worker.js
 worker.ts:1:1 - error TS2580: Cannot find name 'process'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`.
 
 1 process.on("uncaughtException");
@@ -322,53 +280,36 @@ export const foo = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: 
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: mocha
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/mocha
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/mocha
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: mocha/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/mocha/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/mocha/index.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/mocha/index.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: mocha
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/mocha
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/mocha
 Reloading new file names and options
 Synchronizing program
 [12:00:59 AM] File change detected. Starting incremental compilation...
@@ -431,22 +372,16 @@ Change:: npm ci step three: create atTypes node folder
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types
 Reloading new file names and options
 Synchronizing program
 [12:01:03 AM] File change detected. Starting incremental compilation...
@@ -527,36 +462,24 @@ declare namespace NodeJS {
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/base.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/base.d.ts :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject/node_modules 1 undefined Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/@types/node/ts3.6
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
 Project: /user/username/projects/myproject/tsconfig.json Detected file add/remove of non supported extension: /user/username/projects/myproject/node_modules/@types/node/ts3.6
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/node_modules/@types/node/ts3.6 :: WatchInfo: /user/username/projects/myproject 1 undefined Wild card directory
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/@types/node
 Scheduling update
 Reloading new file names and options
 Synchronizing program
@@ -570,7 +493,6 @@ FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/ts3.6/base.d.ts 250 undefined Source file
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types/node/globals.d.ts 250 undefined Source file
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/node_modules/node/package.json 2000 undefined package.json file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: worker.js
 [12:01:20 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
index 66f5bb5c292a2..8dea1d815e32b 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-module-resolution-changes-to-ambient-module.js
@@ -87,28 +87,8 @@ declare module "fs" {
 
 
 Output::
-sysLog:: watchMissingFileSystemEntry:: /a/b/node_modules 1 /a/b/node_modules:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /a/b/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: 
-sysLog:: watchMissingFileSystemEntry:: /a/b/node_modules/@types 1 /a/b/node_modules/@types:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /a/b/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: node
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: @types
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: node/package.json
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types/node/package.json
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: @types/node
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 rename:: node/index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 rename:: @types/node/index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules/@types 1 change:: node
-sysLog:: watchPresentFileSystemEntry:: /a/b/node_modules 1 change:: @types/node
 
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
index 4d3c1fce6dee6..682abdee15795 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-renaming-node_modules-folder-that-already-contains-@types-folder.js
@@ -79,19 +79,8 @@ export {}
 //// [/user/username/projects/myproject/node_modules2/@types/qqq/index.d.ts] deleted
 
 Output::
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/node_modules 1 /user/username/projects/myproject/node_modules:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /user/username/projects/myproject/node_modules:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 /user/username/projects/myproject/node_modules/@types:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 sysLog:: /user/username/projects/myproject/node_modules/@types:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: qqq
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/qqq
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/@types 1 rename:: qqq/index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: @types/qqq/index.d.ts
 
 >> Screen clear
 [12:00:34 AM] File change detected. Starting incremental compilation...
diff --git a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
index 89d98c62aeb81..57076cf6e3a80 100644
--- a/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
+++ b/tests/baselines/reference/tscWatch/resolutionCache/works-when-reusing-program-with-files-from-external-library.js
@@ -112,8 +112,6 @@ module1("hello");
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b/projects/myproject/src 1 change:: file1.ts
-
 >> Screen clear
 [12:00:40 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js b/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
index 725e197cdc986..059b90a59d1d9 100644
--- a/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
+++ b/tests/baselines/reference/tscWatch/watchApi/extraFileExtensions-are-supported.js
@@ -85,14 +85,9 @@ Input::
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: other2.vue
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-
 >> Screen clear
 [12:00:31 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: other2.vue.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
 [12:00:34 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
index 83286fc8537e3..7f5292f597fa5 100644
--- a/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
+++ b/tests/baselines/reference/tscWatch/watchApi/verifies-that-noEmit-is-handled-on-createSemanticDiagnosticsBuilderProgram.js
@@ -79,8 +79,6 @@ export const x = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: main.ts
-
 >> Screen clear
 [12:00:27 AM] File change detected. Starting incremental compilation...
 
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
index 765829369f0c3..96a7d413c8cba 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine-without-implementing-useSourceOfProjectReferenceRedirect.js
@@ -168,11 +168,9 @@ class class3 {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 Loading config file: /user/username/projects/myproject/projects/project1/tsconfig.json
 [12:00:45 AM] File change detected. Starting incremental compilation...
@@ -250,11 +248,9 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:00:49 AM] File change detected. Starting incremental compilation...
 
@@ -263,12 +259,8 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:00:59 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -381,16 +373,12 @@ declare class file {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp/file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: temp
 
 
 WatchedFiles::
@@ -433,11 +421,9 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 2:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:08 AM] File change detected. Starting incremental compilation...
 
@@ -447,9 +433,6 @@ CreatingProgramWith::
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 error TS6053: File '/user/username/projects/myproject/projects/project1/class3.d.ts' not found.
   The file is in the program because:
     Output from referenced project '/user/username/projects/myproject/projects/project1/tsconfig.json' included because '--module' is specified as 'none'
@@ -461,7 +444,6 @@ sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/project
 
 [12:01:18 AM] Found 1 error. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -565,11 +547,9 @@ FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1
 FileWatcher:: Close:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts 0:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 500 undefined Missing file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 [12:01:25 AM] File change detected. Starting incremental compilation...
 
@@ -578,12 +558,8 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.d.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:01:35 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
diff --git a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
index 7b25ba1e0ca65..83f887411c96f 100644
--- a/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
+++ b/tests/baselines/reference/tscWatch/watchApi/when-new-file-is-added-to-the-referenced-project-with-host-implementing-getParsedCommandLine.js
@@ -168,11 +168,9 @@ class class3 {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Scheduling update
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 Synchronizing program
 Loading config file: /user/username/projects/myproject/projects/project1/tsconfig.json
 [12:00:45 AM] File change detected. Starting incremental compilation...
@@ -182,12 +180,8 @@ CreatingProgramWith::
   options: {"module":0,"composite":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/projects/project2/tsconfig.json"}
   projectReferences: [{"path":"/user/username/projects/myproject/projects/project1","originalPath":"../project1"}]
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/projects/project1/class3.ts 250 undefined Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: class2.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo
 [12:00:55 AM] Found 0 errors. Watching for file changes.
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project2 1 change:: tsconfig.tsbuildinfo.readable.baseline.txt
 
 
 Program root files: ["/user/username/projects/myproject/projects/project2/class2.ts"]
@@ -300,16 +294,12 @@ declare class file {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: temp/file.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected excluded file: /user/username/projects/myproject/projects/project1/temp/file.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/temp/file.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: temp
 
 
 WatchedFiles::
@@ -351,11 +341,9 @@ declare class class3 {}
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 rename:: class3.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
 Project: /user/username/projects/myproject/projects/project1/tsconfig.json Detected output file: /user/username/projects/myproject/projects/project1/class3.d.ts
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/projects/project1/class3.d.ts :: WatchInfo: /user/username/projects/myproject/projects/project1 1 undefined Wild card directory of referenced project
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/projects/project1 1 change:: 
 
 
 WatchedFiles::
diff --git a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
index 995a6339443b7..4c5a5c4a2a475 100644
--- a/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
+++ b/tests/baselines/reference/tscWatch/watchApi/without-timesouts-on-host-program-gets-updated.js
@@ -74,11 +74,6 @@ const y =10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: bar.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: bar.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
index b55a99c657475..534e0e7161485 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
@@ -39,10 +39,8 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 {"watchFile":4} Source file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: main.js true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -101,45 +99,30 @@ export function foo2(): string;
 
 
 Output::
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename:: foo.d.ts~ true foo.d.ts /foo.d.ts
-sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts~ true myproject /myproject
-sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: myproject~ true myproject /myproject
-sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to myproject
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 /user/username/projects/myproject/foo.d.ts:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename:: foo.d.ts~ true foo.d.ts /foo.d.ts
-sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts~ true myproject /myproject
-sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: myproject~ true myproject /myproject
-sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to myproject
 Synchronizing program
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js true myproject /myproject
 main.ts:1:10 - error TS2724: '"./foo"' has no exported member named 'foo'. Did you mean 'foo2'?
 
 1 import { foo } from "./foo"; foo();
@@ -200,45 +183,30 @@ export function foo(): string;
 
 
 Output::
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename:: foo.d.ts~ true foo.d.ts /foo.d.ts
-sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts~ true myproject /myproject
-sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: myproject~ true myproject /myproject
-sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to myproject
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 /user/username/projects/myproject/foo.d.ts:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename:: foo.d.ts~ true foo.d.ts /foo.d.ts
-sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts~ true myproject /myproject
-sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to foo.d.ts
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: myproject~ true myproject /myproject
-sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to myproject
 Synchronizing program
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js true myproject /myproject
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
index 6713120866d4b..c4141fa5d0453 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -98,7 +98,6 @@ export declare function foo2(): string;
 
 
 Output::
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename::  true foo.ts /foo.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
@@ -168,18 +167,14 @@ export declare function foo(): string;
 
 
 Output::
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename::  true foo.ts /foo.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.ts:: Changing watcher to MissingFileSystemEntryWatcher
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 /user/username/projects/myproject/foo.ts:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename::  true foo.ts /foo.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
index 70cfa01d2725e..534e0e7161485 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js
@@ -39,10 +39,8 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 250 {"watchFile":4} Source file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"watchFile":4} Type roots
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: main.js true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/main.js :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 [12:00:26 AM] Found 0 errors. Watching for file changes.
 
 
@@ -101,39 +99,30 @@ export function foo2(): string;
 
 
 Output::
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 /user/username/projects/myproject/foo.d.ts:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 Synchronizing program
 [12:00:30 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js true myproject /myproject
 main.ts:1:10 - error TS2724: '"./foo"' has no exported member named 'foo'. Did you mean 'foo2'?
 
 1 import { foo } from "./foo"; foo();
@@ -194,39 +183,30 @@ export function foo(): string;
 
 
 Output::
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
-sysLog:: watchMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 /user/username/projects/myproject/foo.d.ts:: 0
-sysLog:: watchMissingFileSystemEntry::  Callback :: rename, "" and will update the watcher
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject/foo.d.ts 0 rename::  true foo.d.ts /foo.d.ts
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 rename:: foo.d.ts true myproject /myproject
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change::  true myproject /myproject
 Synchronizing program
 [12:00:38 AM] File change detected. Starting incremental compilation...
 
 CreatingProgramWith::
   roots: ["/user/username/projects/myproject/foo.d.ts","/user/username/projects/myproject/main.ts"]
   options: {"watch":true,"extendedDiagnostics":true,"configFilePath":"/user/username/projects/myproject/tsconfig.json"}
-sysLog:: callbackChangingToMissingFileSystemEntry:: /user/username/projects/myproject 1 change:: main.js true myproject /myproject
 [12:00:42 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
index 56bf549b473a1..129e3ec2f790a 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-when-rename-occurs-when-file-is-still-on-the-disk.js
@@ -98,7 +98,6 @@ export declare function foo2(): string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename:: 
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
@@ -167,11 +166,9 @@ export declare function foo(): string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename:: 
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 2:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/foo.ts 0 rename:: 
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.ts 0:: WatchInfo: /user/username/projects/myproject/foo.ts 250 {"watchFile":4} Source file
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
index 559a7dba4e83f..3e010dd8582e3 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js
@@ -76,19 +76,9 @@ Input::
 //// [/a/username/project/src/file1.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 rename:: file1.ts
-sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/username/project 1 change:: src
-sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 rename:: file2.ts
-sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/username/project 1 change:: src
-
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 rename:: file2.js
-sysLog:: watchPresentFileSystemEntry:: /a/username/project/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /a/username/project 1 change:: src
 [12:00:29 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
index 71b85643f6825..571d2cfcb72c0 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js
@@ -62,8 +62,6 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myprojec
 FileWatcher:: Added:: WatchInfo: /home/user/projects/myproject/node_modules/reala/package.json 2000 undefined package.json file
 DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject/node_modules/@types 1 undefined Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject/node_modules/@types 1 undefined Type roots
-sysLog:: watchPresentFileSystemEntry:: /home/user/projects/myproject/src 1 rename:: file.js
-sysLog:: watchPresentFileSystemEntry:: /home/user/projects/myproject/src 1 change:: 
 [12:00:48 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 undefined Wild card directory
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
index 9c8046450650b..5f9740db448a6 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js
@@ -126,17 +126,9 @@ export const x = 10;
 //// [/user/username/projects/myproject/src/file2.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file2.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: renamed.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 >> Screen clear
 [12:00:37 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: file1.js
 error TS6053: File '/user/username/projects/myproject/src/file2.ts' not found.
   The file is in the program because:
     Matched by default include pattern '**/*'
@@ -192,9 +184,6 @@ Output::
 >> Screen clear
 [12:00:42 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 rename:: renamed.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: dist
 user/username/projects/myproject/src/file1.ts:1:19 - error TS2307: Cannot find module './file2' or its corresponding type declarations.
 
 1 import { x } from "./file2";
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
index df4cbd683cf3e..59faa168aad77 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js
@@ -134,10 +134,6 @@ export const y = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file3.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: src
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -178,12 +174,6 @@ Output::
 >> Screen clear
 [12:00:41 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 rename:: file3.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: dist
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 rename:: file3.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/dist 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: dist
 [12:00:46 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
index 58e1a7dd71c2f..ae378d1bdd38e 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js
@@ -27,8 +27,6 @@ Output::
 >> Screen clear
 [12:00:29 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: file1.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:32 AM] Found 0 errors. Watching for file changes.
 
 
@@ -126,21 +124,9 @@ Input::
 //// [/user/username/projects/myproject/node_modules/file2/index.d.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/file2 1 rename:: index.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/file2 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: file2
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/file2 1 rename:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: file2
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-
 >> Screen clear
 [12:00:36 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: file1.js
 user/username/projects/myproject/src/file1.ts:1:19 - error TS2307: Cannot find module 'file2' or its corresponding type declarations.
 
 1 import { x } from "file2";
@@ -243,10 +229,6 @@ Change:: Start npm install
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: 
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -276,10 +258,6 @@ Change:: npm install folder creation of file2
 Input::
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 rename:: file2
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -312,8 +290,6 @@ export const x = 10;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: file2
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
@@ -408,7 +384,6 @@ Output::
 >> Screen clear
 [12:00:50 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: file1.js
 [12:00:54 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
index ee3b0cb995f2d..48df9d0d09b1d 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/setting-default-as-fixed-chunk-size-watch-file-works.js
@@ -78,8 +78,6 @@ var zz30 = 100;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.ts
-
 
 WatchedFiles::
 /a/b/node_modules/@types:
@@ -102,8 +100,6 @@ Output::
 >> Screen clear
 [12:00:26 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
 [12:00:33 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
index 25f4f1161f65f..37d63eb42a659 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
@@ -97,8 +97,6 @@ var zz30 = 100;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.ts
-
 
 WatchedFiles::
 /a/b/node_modules/@types:
@@ -121,8 +119,6 @@ Output::
 >> Screen clear
 [12:00:32 AM] File change detected. Starting incremental compilation...
 
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile1.js
-sysLog:: watchPresentFileSystemEntry:: /a/b 1 change:: commonFile2.js
 [12:00:39 AM] Found 0 errors. Watching for file changes.
 
 
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
index ff40d55d26c25..8a4d9817b7fc4 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-extendedDiagnostics.js
@@ -50,10 +50,8 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Failed Lookup Locations
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/bar/package.json 2000 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} package.json file
 ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeDirectories":["/user/username/projects/myproject/node_modules"]} Wild card directory
@@ -119,9 +117,6 @@ Input::
 //// [/user/username/projects/myproject/node_modules/bar/fooBar.d.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/bar/fooBar.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
index ecbbd881cd06e..17445c13fa132 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js
@@ -52,8 +52,6 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 FileWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/bar/package.json 2000 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} package.json file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Wild card directory
@@ -173,8 +171,6 @@ export function temp(): string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/bar 1 change:: temp
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
index 396906bdcf693..d633c62afa8a6 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js
@@ -36,8 +36,6 @@ Output::
 >> Screen clear
 [12:00:37 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -146,8 +144,6 @@ export function temp(): string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules/bar 1 change:: temp
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
index ca464f91011d0..77eb64d93475c 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option.js
@@ -36,8 +36,6 @@ Output::
 >> Screen clear
 [12:00:37 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -101,9 +99,6 @@ Input::
 //// [/user/username/projects/myproject/node_modules/bar/fooBar.d.ts] deleted
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 rename:: node_modules/bar/fooBar.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
index 75ef71c5a1607..88d25cde1fcc5 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option-extendedDiagnostics.js
@@ -52,10 +52,8 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/mypr
 ExcludeWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/bar/package.json 2000 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} package.json file
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Type roots
 Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject/node_modules/@types 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Type roots
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Failed Lookup Locations
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/src/main.js :: WatchInfo: /user/username/projects/myproject/src 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Failed Lookup Locations
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeFiles":["/user/username/projects/myproject/node_modules/*"]} Wild card directory
@@ -121,9 +119,6 @@ export function fooBar(): string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: bar/foo.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar/foo.d.ts
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
index e516101ea4f18..54ce05a590cbf 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeFiles-option.js
@@ -36,8 +36,6 @@ Output::
 >> Screen clear
 [12:00:37 AM] Starting compilation in watch mode...
 
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 rename:: main.js
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/src 1 change:: 
 [12:00:40 AM] Found 0 errors. Watching for file changes.
 
 
@@ -101,9 +99,6 @@ export function fooBar(): string;
 
 
 Output::
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject/node_modules 1 change:: bar/foo.d.ts
-sysLog:: watchPresentFileSystemEntry:: /user/username/projects/myproject 1 change:: node_modules/bar/foo.d.ts
-
 
 WatchedFiles::
 /user/username/projects/myproject/tsconfig.json:

From 3b428cbaf2ec6ce4428d2e2367841e79f7c972c0 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 8 Jun 2022 16:42:38 -0700
Subject: [PATCH 15/15] Add documentation and fail safe the event firing

---
 src/compiler/sys.ts                           | 14 ++++++++++++-
 ...inode-when-rename-event-ends-with-tilde.js | 20 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 09600e2c38e25..701276b9da920 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -1143,7 +1143,16 @@ namespace ts {
             }
 
             function callbackChangingToMissingFileSystemEntry(event: "rename" | "change", relativeName: string | undefined) {
-                if (relativeName && endsWith(relativeName, "~")) relativeName = relativeName.slice(0, relativeName.length - 1);
+                // In some scenarios, file save operation fires event with fileName.ext~ instead of fileName.ext
+                // To ensure we see the file going missing and coming back up (file delete and then recreated)
+                // and watches being updated correctly we are calling back with fileName.ext as well as fileName.ext~
+                // The worst is we have fired event that was not needed but we wont miss any changes
+                // especially in cases where file goes missing and watches wrong inode
+                let originalRelativeName: string | undefined;
+                if (relativeName && endsWith(relativeName, "~")) {
+                    originalRelativeName = relativeName;
+                    relativeName = relativeName.slice(0, relativeName.length - 1);
+                }
                 // because relativeName is not guaranteed to be correct we need to check on each rename with few combinations
                 // Eg on ubuntu while watching app/node_modules the relativeName is "node_modules" which is neither relative nor full path
                 if (event === "rename" &&
@@ -1151,8 +1160,10 @@ namespace ts {
                         relativeName === lastDirectoryPart ||
                         endsWith(relativeName, lastDirectoryPartWithDirectorySeparator!))) {
                     const modifiedTime = getModifiedTime(fileOrDirectory) || missingFileModifiedTime;
+                    if (originalRelativeName) callback(event, originalRelativeName, modifiedTime);
                     callback(event, relativeName, modifiedTime);
                     if (inodeWatching) {
+                        // If this was rename event, inode has changed means we need to update watcher
                         updateWatcher(modifiedTime === missingFileModifiedTime ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
                     }
                     else if (modifiedTime === missingFileModifiedTime) {
@@ -1160,6 +1171,7 @@ namespace ts {
                     }
                 }
                 else {
+                    if (originalRelativeName) callback(event, originalRelativeName);
                     callback(event, relativeName);
                 }
             }
diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
index 534e0e7161485..68b98e430f771 100644
--- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
+++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js
@@ -102,7 +102,12 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
@@ -113,7 +118,12 @@ sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to Presen
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
@@ -186,7 +196,12 @@ Output::
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 2:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to MissingFileSystemEntryWatcher
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
@@ -197,7 +212,12 @@ sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to Presen
 FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 Scheduling update
 Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
+Scheduling update
+Elapsed:: *ms FileWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts 0:: WatchInfo: /user/username/projects/myproject/foo.d.ts 250 {"watchFile":4} Source file
 sysLog:: /user/username/projects/myproject/foo.d.ts:: Changing watcher to PresentFileSystemEntryWatcher
+DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
+Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts~ :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations
 Scheduling invalidateFailedLookup, Cancelled earlier one
 Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myproject/foo.d.ts :: WatchInfo: /user/username/projects/myproject 0 {"watchFile":4} Failed Lookup Locations