typescript 7.1.0-dev.20261019.1 → 7.1.0-dev.20261020.3

package/dist/api/sync/api.js

@@ -22,7 +22,7 @@ import { TypePredicateKind } from "#enums/typePredicateKind";
 import { ModifierFlags, unescapeLeadingUnderscores, } from "../../ast/index.js";
 import { assertNever } from "../../internal/utils.js";
 import { encodeNode, uint8ArrayToBase64, } from "../node/encoder.js";
-import { decodeNode, getNodeId, parseNodeHandleFromCompiler, readParseOptionsKey, readSourceFileHash, readSourceFileLease, RemoteNode, RemoteSourceFile, } from "../node/node.js";
+import { decodeNode, getNodeId, getNodeRequestHandle, parseNodeHandleFromCompiler, readParseOptionsKey, readSourceFileHash, readSourceFileLease, RemoteNode, RemoteSourceFile, } from "../node/node.js";
 import { Wtf8Decoder } from "../node/wtf8.js";
 import { canonicalize, CaseSensitivity, pathKey, toRootedDirectoryPath, toRootedPath, } from "../path.js";
 import { prepareCompilerOptions } from "../prepareCompilerOptions.generated.js";
@@ -1128,13 +1128,15 @@ export class ModuleResolver {
 }
 class SnapshotObjectRegistry {
     symbols = new Map();
+    nodeHandles = new Map();
     projectRegistries = new Map();
     snapshotId;
+    disposed = false;
     constructor(snapshotId) {
         this.snapshotId = snapshotId;
     }
     addProjectRegistry(registry) {
-        this.projectRegistries.set(registry.project.id, registry);
+        this.projectRegistries.set(registry.project.handle, registry);
     }
     getOrCreateSymbol(data) {
         const reference = data.reference;
@@ -1156,8 +1158,19 @@ class SnapshotObjectRegistry {
     getSymbol(id) {
         return this.symbols.get(id);
     }
+    getOrCreateNodeHandle(handle, project) {
+        let node = this.nodeHandles.get(handle);
+        if (!node) {
+            node = new NodeHandle(handle, project);
+            if (!this.disposed)
+                this.nodeHandles.set(handle, node);
+        }
+        return node;
+    }
     clear() {
+        this.disposed = true;
         this.symbols.clear();
+        this.nodeHandles.clear();
     }
 }
 class ProjectObjectRegistry {
@@ -1217,7 +1230,7 @@ class ProjectObjectRegistry {
         return this.types.get(id);
     }
     createNodeHandle(handle) {
-        return new NodeHandle(handle, this.project);
+        return this.snapshotRegistry.getOrCreateNodeHandle(handle, this.project);
     }
     getOrCreateSignature(data) {
         let sig = this.signatures.get(data.id);
@@ -1251,7 +1264,7 @@ class ProjectObjectRegistry {
             }
             const data = owner.client.apiRequest(method, {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 objectId: source.id,
             });
             if (!data)
@@ -1267,7 +1280,7 @@ class ProjectObjectRegistry {
             }
             const data = yield* apiRequest(method, {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 objectId: source.id,
             });
             if (!data)
@@ -1301,7 +1314,7 @@ class ProjectObjectRegistry {
                 ? owner.client.apiRequest(method, { symbol: source.reference })
                 : owner.client.apiRequest(method, {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     objectId: source.id,
                 });
             if (!data)
@@ -1317,7 +1330,7 @@ class ProjectObjectRegistry {
                 ? yield* apiRequest(method, { symbol: source.reference })
                 : yield* apiRequest(method, {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     objectId: source.id,
                 });
             if (!data)
@@ -1335,7 +1348,7 @@ class ProjectObjectRegistry {
                 return cached;
             const data = owner.client.apiRequest(method, {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 objectId: source.id,
             });
             if (!data)
@@ -1349,7 +1362,7 @@ class ProjectObjectRegistry {
                 return cached;
             const data = yield* apiRequest(method, {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 objectId: source.id,
             });
             if (!data)
@@ -1376,7 +1389,7 @@ class ProjectObjectRegistry {
             }
             const typesData = owner.client.apiRequest(method, {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 objectId: source.id,
             });
             if (typesData == null)
@@ -1400,7 +1413,7 @@ class ProjectObjectRegistry {
             }
             const typesData = yield* apiRequest(method, {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 objectId: source.id,
             });
             if (typesData == null)
@@ -1446,7 +1459,7 @@ class ProjectObjectRegistry {
                 ? owner.client.apiRequest(method, { symbol: source.reference })
                 : owner.client.apiRequest(method, {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     objectId: source.id,
                 });
             return data?.map(symbol => owner.getOrCreateSymbol(symbol)) ?? [];
@@ -1455,7 +1468,7 @@ class ProjectObjectRegistry {
                 ? yield* apiRequest(method, { symbol: source.reference })
                 : yield* apiRequest(method, {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     objectId: source.id,
                 });
             return data?.map(symbol => owner.getOrCreateSymbol(symbol)) ?? [];
@@ -1468,7 +1481,7 @@ class ProjectObjectRegistry {
         return cacheGeneratorMethod(owner, "fetchBaseTypes", function (source) {
             const typesData = owner.client.apiRequest("getBaseTypes", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: source.id,
             });
             if (typesData == null)
@@ -1477,7 +1490,7 @@ class ProjectObjectRegistry {
         }, function* (source) {
             const typesData = yield* apiRequest("getBaseTypes", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: source.id,
             });
             if (typesData == null)
@@ -1490,14 +1503,14 @@ class ProjectObjectRegistry {
         return cacheGeneratorMethod(owner, "fetchPropertiesOfType", function (source) {
             const data = owner.client.apiRequest("getPropertiesOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: source.id,
             });
             return data ? data.map(symbol => owner.getOrCreateSymbol(symbol)) : [];
         }, function* (source) {
             const data = yield* apiRequest("getPropertiesOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: source.id,
             });
             return data ? data.map(symbol => owner.getOrCreateSymbol(symbol)) : [];
@@ -1508,14 +1521,14 @@ class ProjectObjectRegistry {
         return cacheGeneratorMethod(owner, "fetchApparentPropertiesOfType", function (source) {
             const data = owner.client.apiRequest("getApparentPropertiesOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 objectId: source.id,
             });
             return data ? data.map(symbol => owner.getOrCreateSymbol(symbol)) : [];
         }, function* (source) {
             const data = yield* apiRequest("getApparentPropertiesOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 objectId: source.id,
             });
             return data ? data.map(symbol => owner.getOrCreateSymbol(symbol)) : [];
@@ -1526,7 +1539,7 @@ class ProjectObjectRegistry {
         return cacheGeneratorMethod(owner, "fetchPropertyOfType", function (source, name) {
             const data = owner.client.apiRequest("getPropertyOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: source.id,
                 name,
             });
@@ -1534,7 +1547,7 @@ class ProjectObjectRegistry {
         }, function* (source, name) {
             const data = yield* apiRequest("getPropertyOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: source.id,
                 name,
             });
@@ -1546,7 +1559,7 @@ class ProjectObjectRegistry {
         return cacheGeneratorMethod(owner, "fetchSignaturesOfType", function (source, kind) {
             const data = owner.client.apiRequest("getSignaturesOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: source.id,
                 kind,
             });
@@ -1554,7 +1567,7 @@ class ProjectObjectRegistry {
         }, function* (source, kind) {
             const data = yield* apiRequest("getSignaturesOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: source.id,
                 kind,
             });
@@ -1566,7 +1579,7 @@ class ProjectObjectRegistry {
         return cacheGeneratorMethod(owner, "fetchIndexInfosOfType", function (source) {
             const data = owner.client.apiRequest("getIndexInfosOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: source.id,
             });
             if (!data)
@@ -1575,12 +1588,12 @@ class ProjectObjectRegistry {
                 keyType: owner.getOrCreateType(info.keyType),
                 valueType: owner.getOrCreateType(info.valueType),
                 isReadonly: info.isReadonly ?? false,
-                declaration: info.declaration ? new NodeHandle(info.declaration, owner.project) : undefined,
+                declaration: info.declaration ? owner.createNodeHandle(info.declaration) : undefined,
             }));
         }, function* (source) {
             const data = yield* apiRequest("getIndexInfosOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: source.id,
             });
             if (!data)
@@ -1589,7 +1602,7 @@ class ProjectObjectRegistry {
                 keyType: owner.getOrCreateType(info.keyType),
                 valueType: owner.getOrCreateType(info.valueType),
                 isReadonly: info.isReadonly ?? false,
-                declaration: info.declaration ? new NodeHandle(info.declaration, owner.project) : undefined,
+                declaration: info.declaration ? owner.createNodeHandle(info.declaration) : undefined,
             }));
         });
     }
@@ -1598,7 +1611,7 @@ class ProjectObjectRegistry {
         return cacheGeneratorMethod(owner, "fetchTypeParameterAtPosition", function (source, pos) {
             const data = owner.client.apiRequest("getTypeParameterAtPosition", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 signature: source.id,
                 index: pos,
             });
@@ -1606,7 +1619,7 @@ class ProjectObjectRegistry {
         }, function* (source, pos) {
             const data = yield* apiRequest("getTypeParameterAtPosition", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 signature: source.id,
                 index: pos,
             });
@@ -1618,6 +1631,11 @@ export class Project {
     /** @internal */
     api;
     id;
+    /**
+     * Server identity for this project's lifetime across snapshots.
+     * @internal
+     */
+    handle;
     configFileName;
     currentDirectory;
     dirty;
@@ -1627,6 +1645,7 @@ export class Project {
     languageService;
     constructor(data, snapshotId, toPath, api, snapshotRegistry) {
         this.id = data.id;
+        this.handle = data.handle;
         this.api = api;
         this.configFileName = data.configFileName;
         this.currentDirectory = data.currentDirectory;
@@ -1676,7 +1695,7 @@ export class LanguageService {
             });
             const data = owner.client.apiRequest("getImportAdderEdits", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 actions: requestActions,
             });
@@ -1699,7 +1718,7 @@ export class LanguageService {
             });
             const data = yield* apiRequest("getImportAdderEdits", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 actions: requestActions,
             });
@@ -1743,26 +1762,26 @@ export class LanguageService {
         return cacheGeneratorMethod(owner, "getReferencedSymbolsForNode", function (node, position) {
             const data = owner.client.apiRequest("getReferencedSymbolsForNode", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                node: getNodeId(node),
+                project: owner.project.handle,
+                node: getNodeRequestHandle(node),
                 position,
             });
             return (data ?? []).map(entry => ({
-                definition: new NodeHandle(entry.definition, owner.project),
+                definition: owner.objectRegistry.createNodeHandle(entry.definition),
                 symbol: entry.symbol ? owner.objectRegistry.getOrCreateSymbol(entry.symbol) : undefined,
-                references: (entry.references ?? []).map(h => new NodeHandle(h, owner.project)),
+                references: (entry.references ?? []).map(h => owner.objectRegistry.createNodeHandle(h)),
             }));
         }, function* (node, position) {
             const data = yield* apiRequest("getReferencedSymbolsForNode", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                node: getNodeId(node),
+                project: owner.project.handle,
+                node: getNodeRequestHandle(node),
                 position,
             });
             return (data ?? []).map(entry => ({
-                definition: new NodeHandle(entry.definition, owner.project),
+                definition: owner.objectRegistry.createNodeHandle(entry.definition),
                 symbol: entry.symbol ? owner.objectRegistry.getOrCreateSymbol(entry.symbol) : undefined,
-                references: (entry.references ?? []).map(h => new NodeHandle(h, owner.project)),
+                references: (entry.references ?? []).map(h => owner.objectRegistry.createNodeHandle(h)),
             }));
         });
     }
@@ -1771,22 +1790,22 @@ export class LanguageService {
         return cacheGeneratorMethod(owner, "getSignatureUsage", function (signatureDecl) {
             const data = owner.client.apiRequest("getSignatureUsages", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                signatureDecl: getNodeId(signatureDecl),
+                project: owner.project.handle,
+                signatureDecl: getNodeRequestHandle(signatureDecl),
             });
             return (data ?? []).map(entry => ({
-                name: new NodeHandle(entry.name, owner.project),
-                call: entry.call ? new NodeHandle(entry.call, owner.project) : undefined,
+                name: owner.objectRegistry.createNodeHandle(entry.name),
+                call: entry.call ? owner.objectRegistry.createNodeHandle(entry.call) : undefined,
             }));
         }, function* (signatureDecl) {
             const data = yield* apiRequest("getSignatureUsages", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                signatureDecl: getNodeId(signatureDecl),
+                project: owner.project.handle,
+                signatureDecl: getNodeRequestHandle(signatureDecl),
             });
             return (data ?? []).map(entry => ({
-                name: new NodeHandle(entry.name, owner.project),
-                call: entry.call ? new NodeHandle(entry.call, owner.project) : undefined,
+                name: owner.objectRegistry.createNodeHandle(entry.name),
+                call: entry.call ? owner.objectRegistry.createNodeHandle(entry.call) : undefined,
             }));
         });
     }
@@ -1795,7 +1814,7 @@ export class LanguageService {
         return cacheGeneratorMethod(owner, "getCompletionsAtPosition", function (document, position, options) {
             const data = owner.client.apiRequest("getCompletionsAtPosition", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file: document,
                 position,
                 triggerCharacter: options?.triggerCharacter,
@@ -1813,7 +1832,7 @@ export class LanguageService {
         }, function* (document, position, options) {
             const data = yield* apiRequest("getCompletionsAtPosition", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file: document,
                 position,
                 triggerCharacter: options?.triggerCharacter,
@@ -1846,7 +1865,7 @@ export class LanguageService {
             const base64 = uint8ArrayToBase64(encoded);
             return owner.client.apiRequest("formatNodeForInsertion", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 position,
                 data: base64,
@@ -1856,7 +1875,7 @@ export class LanguageService {
             const base64 = uint8ArrayToBase64(encoded);
             return yield* apiRequest("formatNodeForInsertion", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 position,
                 data: base64,
@@ -1965,7 +1984,7 @@ export class Program {
             // Fetch from server
             const binaryData = owner.client.apiRequestBinary("getSourceFile", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
             });
             if (!binaryData) {
@@ -1983,7 +2002,7 @@ export class Program {
             // Fetch from server
             const binaryData = sourceFileResponseToUint8Array(yield* apiRequest("getSourceFile", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
             }));
             if (!binaryData) {
@@ -1999,7 +2018,7 @@ export class Program {
         return cacheGeneratorMethod(owner, "getResolvedModule", function (file, moduleName, mode) {
             const result = owner.client.apiRequest("getResolvedModule", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 moduleName,
                 mode,
@@ -2008,7 +2027,7 @@ export class Program {
         }, function* (file, moduleName, mode) {
             const result = yield* apiRequest("getResolvedModule", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 moduleName,
                 mode,
@@ -2021,16 +2040,16 @@ export class Program {
         return cacheGeneratorMethod(owner, "getModeForUsageLocation", function (file, usage) {
             return owner.client.apiRequest("getModeForUsageLocation", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
-                usage: getNodeId(usage),
+                usage: getNodeRequestHandle(usage),
             });
         }, function* (file, usage) {
             return yield* apiRequest("getModeForUsageLocation", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
-                usage: getNodeId(usage),
+                usage: getNodeRequestHandle(usage),
             });
         });
     }
@@ -2039,14 +2058,14 @@ export class Program {
         return cacheGeneratorMethod(owner, "getModeForResolutionAtIndex", function (file, index) {
             return owner.client.apiRequest("getModeForResolutionAtIndex", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 index,
             });
         }, function* (file, index) {
             return yield* apiRequest("getModeForResolutionAtIndex", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 index,
             });
@@ -2057,16 +2076,16 @@ export class Program {
         return cacheGeneratorMethod(owner, "getResolvedModuleFromModuleSpecifier", function (moduleSpecifier, sourceFile) {
             const result = owner.client.apiRequest("getResolvedModuleFromModuleSpecifier", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                moduleSpecifier: getNodeId(moduleSpecifier),
+                project: owner.project.handle,
+                moduleSpecifier: getNodeRequestHandle(moduleSpecifier),
                 sourceFile,
             });
             return result ?? undefined;
         }, function* (moduleSpecifier, sourceFile) {
             const result = yield* apiRequest("getResolvedModuleFromModuleSpecifier", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                moduleSpecifier: getNodeId(moduleSpecifier),
+                project: owner.project.handle,
+                moduleSpecifier: getNodeRequestHandle(moduleSpecifier),
                 sourceFile,
             });
             return result ?? undefined;
@@ -2077,7 +2096,7 @@ export class Program {
         return cacheGeneratorMethod(owner, "getResolvedTypeReferenceDirective", function (file, typeDirectiveName, mode) {
             const result = owner.client.apiRequest("getResolvedTypeReferenceDirective", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 typeDirectiveName,
                 mode,
@@ -2086,7 +2105,7 @@ export class Program {
         }, function* (file, typeDirectiveName, mode) {
             const result = yield* apiRequest("getResolvedTypeReferenceDirective", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 typeDirectiveName,
                 mode,
@@ -2099,7 +2118,7 @@ export class Program {
         return cacheGeneratorMethod(owner, "getResolvedTypeReferenceDirectiveFromTypeReferenceDirective", function (typeReferenceDirective, sourceFile) {
             const result = owner.client.apiRequest("getResolvedTypeReferenceDirectiveFromTypeReferenceDirective", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 sourceFile,
                 typeDirectiveName: typeReferenceDirective.fileName,
                 resolutionMode: typeReferenceDirective.resolutionMode,
@@ -2108,7 +2127,7 @@ export class Program {
         }, function* (typeReferenceDirective, sourceFile) {
             const result = yield* apiRequest("getResolvedTypeReferenceDirectiveFromTypeReferenceDirective", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 sourceFile,
                 typeDirectiveName: typeReferenceDirective.fileName,
                 resolutionMode: typeReferenceDirective.resolutionMode,
@@ -2121,13 +2140,13 @@ export class Program {
         return cacheGeneratorMethod(owner, "getSourceFileNames", function () {
             const data = owner.client.apiRequest("getSourceFileNames", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
             return data ?? [];
         }, function* () {
             const data = yield* apiRequest("getSourceFileNames", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
             return data ?? [];
         });
@@ -2176,7 +2195,7 @@ export class Program {
             // client-provided path text as untrusted input.
             const data = owner.client.apiRequest("getSourceFileMetadata", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file: path,
             });
             return data ?? undefined;
@@ -2185,7 +2204,7 @@ export class Program {
             // client-provided path text as untrusted input.
             const data = yield* apiRequest("getSourceFileMetadata", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file: path,
             });
             return data ?? undefined;
@@ -2233,13 +2252,13 @@ export class Program {
         return cacheGeneratorMethod(owner, "getConfigFileNames", function () {
             const data = owner.client.apiRequest("getConfigFileNames", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
             return data ?? [];
         }, function* () {
             const data = yield* apiRequest("getConfigFileNames", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
             return data ?? [];
         });
@@ -2253,7 +2272,7 @@ export class Program {
         return cacheGeneratorMethod(owner, "getConfigSourceFile", function (file) {
             const binaryData = owner.client.apiRequestBinary("getConfigSourceFile", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
             });
             if (!binaryData) {
@@ -2263,7 +2282,7 @@ export class Program {
         }, function* (file) {
             const binaryData = sourceFileResponseToUint8Array(yield* apiRequest("getConfigSourceFile", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
             }));
             if (!binaryData) {
@@ -2284,7 +2303,7 @@ export class Program {
                     : [file];
             const data = owner.client.apiRequest("getSyntacticDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return data ?? [];
@@ -2294,7 +2313,7 @@ export class Program {
                     : [file];
             const data = yield* apiRequest("getSyntacticDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return data ?? [];
@@ -2312,7 +2331,7 @@ export class Program {
                     : [file];
             const data = owner.client.apiRequest("getBindDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return data ?? [];
@@ -2322,7 +2341,7 @@ export class Program {
                     : [file];
             const data = yield* apiRequest("getBindDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return data ?? [];
@@ -2340,7 +2359,7 @@ export class Program {
                     : [file];
             const data = owner.client.apiRequest("getSemanticDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return data ?? [];
@@ -2350,7 +2369,7 @@ export class Program {
                     : [file];
             const data = yield* apiRequest("getSemanticDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return data ?? [];
@@ -2368,7 +2387,7 @@ export class Program {
                     : [file];
             const data = owner.client.apiRequest("getSuggestionDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return data ?? [];
@@ -2378,7 +2397,7 @@ export class Program {
                     : [file];
             const data = yield* apiRequest("getSuggestionDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return data ?? [];
@@ -2396,7 +2415,7 @@ export class Program {
                     : [file];
             const data = owner.client.apiRequest("getDeclarationDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return data ?? [];
@@ -2406,7 +2425,7 @@ export class Program {
                     : [file];
             const data = yield* apiRequest("getDeclarationDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return data ?? [];
@@ -2420,13 +2439,13 @@ export class Program {
         return cacheGeneratorMethod(owner, "getProgramDiagnostics", function () {
             const data = owner.client.apiRequest("getProgramDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
             return data ?? [];
         }, function* () {
             const data = yield* apiRequest("getProgramDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
             return data ?? [];
         });
@@ -2439,13 +2458,13 @@ export class Program {
         return cacheGeneratorMethod(owner, "getGlobalDiagnostics", function () {
             const data = owner.client.apiRequest("getGlobalDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
             return data ?? [];
         }, function* () {
             const data = yield* apiRequest("getGlobalDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
             return data ?? [];
         });
@@ -2458,13 +2477,13 @@ export class Program {
         return cacheGeneratorMethod(owner, "getConfigFileParsingDiagnostics", function () {
             const data = owner.client.apiRequest("getConfigFileParsingDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
             return data ?? [];
         }, function* () {
             const data = yield* apiRequest("getConfigFileParsingDiagnostics", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
             return data ?? [];
         });
@@ -2479,7 +2498,7 @@ export class Program {
         return cacheGeneratorMethod(owner, "emit", function (emitOnly) {
             const response = owner.client.apiRequest("emit", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 emitOnly,
             });
             const fileSystem = response.emittedFilesContents.length
@@ -2497,7 +2516,7 @@ export class Program {
         }, function* (emitOnly) {
             const response = yield* apiRequest("emit", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 emitOnly,
             });
             const fileSystem = response.emittedFilesContents.length
@@ -2522,14 +2541,14 @@ export class Program {
         return cacheGeneratorMethod(owner, "emitToString", function (emitOnly) {
             const response = owner.client.apiRequest("emitToString", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 emitOnly,
             });
             return toEmitOutput(response);
         }, function* (emitOnly) {
             const response = yield* apiRequest("emitToString", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 emitOnly,
             });
             return toEmitOutput(response);
@@ -2543,14 +2562,14 @@ export class Program {
         return cacheGeneratorMethod(owner, "getJavaScriptEmit", function (files) {
             const response = owner.client.apiRequest("getJavaScriptEmit", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return toEmitOutput(response);
         }, function* (files) {
             const response = yield* apiRequest("getJavaScriptEmit", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return toEmitOutput(response);
@@ -2564,14 +2583,14 @@ export class Program {
         return cacheGeneratorMethod(owner, "getDeclarationEmit", function (files) {
             const response = owner.client.apiRequest("getDeclarationEmit", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return toEmitOutput(response);
         }, function* (files) {
             const response = yield* apiRequest("getDeclarationEmit", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 files,
             });
             return toEmitOutput(response);
@@ -2746,14 +2765,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getMergedSymbol", function (symbol) {
             const data = owner.client.apiRequest("getMergedSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return owner.objectRegistry.getOrCreateSymbol(data);
         }, function* (symbol) {
             const data = yield* apiRequest("getMergedSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return owner.objectRegistry.getOrCreateSymbol(data);
@@ -2768,15 +2787,15 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getSymbolOfNode", function (node) {
             const data = owner.client.apiRequest("getSymbolOfNode", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
         }, function* (node) {
             const data = yield* apiRequest("getSymbolOfNode", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
         });
@@ -2787,16 +2806,16 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getSymbolOfDeclaration", function (node) {
             const data = owner.client.apiRequest("getSymbolOfDeclarationForChecker", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             // Declarations normally have symbols, but preserve unexpected null results at runtime.
             return (data && owner.objectRegistry.getOrCreateSymbol(data));
         }, function* (node) {
             const data = yield* apiRequest("getSymbolOfDeclarationForChecker", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             // Declarations normally have symbols, but preserve unexpected null results at runtime.
             return (data && owner.objectRegistry.getOrCreateSymbol(data));
@@ -2808,14 +2827,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getParentOfSymbol", function (symbol) {
             const data = owner.client.apiRequest("getParentOfSymbolForChecker", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
         }, function* (symbol) {
             const data = yield* apiRequest("getParentOfSymbolForChecker", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
@@ -2827,15 +2846,15 @@ export class Checker {
             if (Array.isArray(nodeOrNodes)) {
                 const data = owner.client.apiRequest("getSymbolsAtLocations", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
-                    locations: nodeOrNodes.map(node => getNodeId(node)),
+                    project: owner.project.handle,
+                    locations: nodeOrNodes.map(node => getNodeRequestHandle(node)),
                 });
                 return data.map(d => d ? owner.objectRegistry.getOrCreateSymbol(d) : undefined);
             }
             const data = owner.client.apiRequest("getSymbolAtLocation", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(nodeOrNodes),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(nodeOrNodes),
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
         }
@@ -2843,15 +2862,15 @@ export class Checker {
             if (Array.isArray(nodeOrNodes)) {
                 const data = yield* apiRequest("getSymbolsAtLocations", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
-                    locations: nodeOrNodes.map(node => getNodeId(node)),
+                    project: owner.project.handle,
+                    locations: nodeOrNodes.map(node => getNodeRequestHandle(node)),
                 });
                 return data.map(d => d ? owner.objectRegistry.getOrCreateSymbol(d) : undefined);
             }
             const data = yield* apiRequest("getSymbolAtLocation", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(nodeOrNodes),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(nodeOrNodes),
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
         }
@@ -2863,7 +2882,7 @@ export class Checker {
             if (typeof positionOrPositions === "number") {
                 const data = owner.client.apiRequest("getSymbolAtPosition", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     file,
                     position: positionOrPositions,
                 });
@@ -2871,7 +2890,7 @@ export class Checker {
             }
             const data = owner.client.apiRequest("getSymbolsAtPositions", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 positions: positionOrPositions,
             });
@@ -2881,7 +2900,7 @@ export class Checker {
             if (typeof positionOrPositions === "number") {
                 const data = yield* apiRequest("getSymbolAtPosition", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     file,
                     position: positionOrPositions,
                 });
@@ -2889,7 +2908,7 @@ export class Checker {
             }
             const data = yield* apiRequest("getSymbolsAtPositions", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 positions: positionOrPositions,
             });
@@ -2903,14 +2922,14 @@ export class Checker {
             if (Array.isArray(fileOrFiles)) {
                 const data = owner.client.apiRequest("getSymbolsOfSourceFiles", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     files: fileOrFiles,
                 });
                 return data.map(d => d ? owner.objectRegistry.getOrCreateSymbol(d) : undefined);
             }
             const data = owner.client.apiRequest("getSymbolOfSourceFile", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file: fileOrFiles,
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
@@ -2919,14 +2938,14 @@ export class Checker {
             if (Array.isArray(fileOrFiles)) {
                 const data = yield* apiRequest("getSymbolsOfSourceFiles", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     files: fileOrFiles,
                 });
                 return data.map(d => d ? owner.objectRegistry.getOrCreateSymbol(d) : undefined);
             }
             const data = yield* apiRequest("getSymbolOfSourceFile", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file: fileOrFiles,
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
@@ -2944,14 +2963,14 @@ export class Checker {
             if (Array.isArray(symbolOrSymbols)) {
                 const data = owner.client.apiRequest("getTypesOfSymbols", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     symbols: symbolOrSymbols.map(symbol => symbol.reference),
                 });
                 return data.map(d => owner.objectRegistry.getOrCreateType(d));
             }
             const data = owner.client.apiRequest("getTypeOfSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbolOrSymbols.reference,
             });
             return owner.objectRegistry.getOrCreateType(data);
@@ -2960,14 +2979,14 @@ export class Checker {
             if (Array.isArray(symbolOrSymbols)) {
                 const data = yield* apiRequest("getTypesOfSymbols", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     symbols: symbolOrSymbols.map(symbol => symbol.reference),
                 });
                 return data.map(d => owner.objectRegistry.getOrCreateType(d));
             }
             const data = yield* apiRequest("getTypeOfSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbolOrSymbols.reference,
             });
             return owner.objectRegistry.getOrCreateType(data);
@@ -2984,14 +3003,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getDeclaredTypeOfSymbol", function (symbol) {
             const data = owner.client.apiRequest("getDeclaredTypeOfSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return owner.objectRegistry.getOrCreateType(data);
         }, function* (symbol) {
             const data = yield* apiRequest("getDeclaredTypeOfSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return owner.objectRegistry.getOrCreateType(data);
@@ -3008,14 +3027,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getNonMissingTypeOfSymbol", function (symbol) {
             const data = owner.client.apiRequest("getNonMissingTypeOfSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return owner.objectRegistry.getOrCreateType(data);
         }, function* (symbol) {
             const data = yield* apiRequest("getNonMissingTypeOfSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return owner.objectRegistry.getOrCreateType(data);
@@ -3026,19 +3045,19 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getReferencesToSymbolInFile", function (file, symbol) {
             const data = owner.client.apiRequest("getReferencesToSymbolInFile", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 symbol: symbol.reference,
             });
-            return (data ?? []).map(h => new NodeHandle(h, owner.project));
+            return (data ?? []).map(h => owner.objectRegistry.createNodeHandle(h));
         }, function* (file, symbol) {
             const data = yield* apiRequest("getReferencesToSymbolInFile", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 symbol: symbol.reference,
             });
-            return (data ?? []).map(h => new NodeHandle(h, owner.project));
+            return (data ?? []).map(h => owner.objectRegistry.createNodeHandle(h));
         });
     }
     /**
@@ -3052,15 +3071,15 @@ export class Checker {
             if (Array.isArray(nodeOrNodes)) {
                 const data = owner.client.apiRequest("getTypeAtLocations", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
-                    locations: nodeOrNodes.map(node => getNodeId(node)),
+                    project: owner.project.handle,
+                    locations: nodeOrNodes.map(node => getNodeRequestHandle(node)),
                 });
                 return data.map(d => owner.objectRegistry.getOrCreateType(d));
             }
             const data = owner.client.apiRequest("getTypeAtLocation", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(nodeOrNodes),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(nodeOrNodes),
             });
             return owner.objectRegistry.getOrCreateType(data);
         }
@@ -3068,15 +3087,15 @@ export class Checker {
             if (Array.isArray(nodeOrNodes)) {
                 const data = yield* apiRequest("getTypeAtLocations", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
-                    locations: nodeOrNodes.map(node => getNodeId(node)),
+                    project: owner.project.handle,
+                    locations: nodeOrNodes.map(node => getNodeRequestHandle(node)),
                 });
                 return data.map(d => owner.objectRegistry.getOrCreateType(d));
             }
             const data = yield* apiRequest("getTypeAtLocation", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(nodeOrNodes),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(nodeOrNodes),
             });
             return owner.objectRegistry.getOrCreateType(data);
         }
@@ -3100,15 +3119,15 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getResolvedSignature", function (node) {
             const data = owner.client.apiRequest("getResolvedSignature", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return owner.objectRegistry.getOrCreateSignature(data);
         }, function* (node) {
             const data = yield* apiRequest("getResolvedSignature", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return owner.objectRegistry.getOrCreateSignature(data);
         });
@@ -3119,7 +3138,7 @@ export class Checker {
             if (typeof positionOrPositions === "number") {
                 const data = owner.client.apiRequest("getTypeAtPosition", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     file,
                     position: positionOrPositions,
                 });
@@ -3127,7 +3146,7 @@ export class Checker {
             }
             const data = owner.client.apiRequest("getTypesAtPositions", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 positions: positionOrPositions,
             });
@@ -3137,7 +3156,7 @@ export class Checker {
             if (typeof positionOrPositions === "number") {
                 const data = yield* apiRequest("getTypeAtPosition", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     file,
                     position: positionOrPositions,
                 });
@@ -3145,7 +3164,7 @@ export class Checker {
             }
             const data = yield* apiRequest("getTypesAtPositions", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 file,
                 positions: positionOrPositions,
             });
@@ -3160,10 +3179,10 @@ export class Checker {
             const isNode = location && "kind" in location;
             const data = owner.client.apiRequest("resolveName", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 name,
                 meaning,
-                location: isNode ? getNodeId(location) : undefined,
+                location: isNode ? getNodeRequestHandle(location) : undefined,
                 file: !isNode && location ? location.document : undefined,
                 position: !isNode && location ? location.position : undefined,
                 excludeGlobals,
@@ -3174,10 +3193,10 @@ export class Checker {
             const isNode = location && "kind" in location;
             const data = yield* apiRequest("resolveName", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 name,
                 meaning,
-                location: isNode ? getNodeId(location) : undefined,
+                location: isNode ? getNodeRequestHandle(location) : undefined,
                 file: !isNode && location ? location.document : undefined,
                 position: !isNode && location ? location.position : undefined,
                 excludeGlobals,
@@ -3195,9 +3214,9 @@ export class Checker {
             const isNode = "kind" in location;
             const data = owner.client.apiRequest("getSymbolsInScope", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 meaning,
-                location: isNode ? getNodeId(location) : undefined,
+                location: isNode ? getNodeRequestHandle(location) : undefined,
                 file: isNode ? undefined : location.document,
                 position: isNode ? undefined : location.position,
             });
@@ -3207,9 +3226,9 @@ export class Checker {
             const isNode = "kind" in location;
             const data = yield* apiRequest("getSymbolsInScope", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 meaning,
-                location: isNode ? getNodeId(location) : undefined,
+                location: isNode ? getNodeRequestHandle(location) : undefined,
                 file: isNode ? undefined : location.document,
                 position: isNode ? undefined : location.position,
             });
@@ -3235,15 +3254,15 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getContextualType", function (node) {
             const data = owner.client.apiRequest("getContextualType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return data ? owner.objectRegistry.getOrCreateType(data) : undefined;
         }, function* (node) {
             const data = yield* apiRequest("getContextualType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return data ? owner.objectRegistry.getOrCreateType(data) : undefined;
         });
@@ -3253,16 +3272,16 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getContextualTypeForArgumentAtIndex", function (node, argIndex) {
             const data = owner.client.apiRequest("getContextualTypeForArgument", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
                 index: argIndex,
             });
             return data ? owner.objectRegistry.getOrCreateType(data) : undefined;
         }, function* (node, argIndex) {
             const data = yield* apiRequest("getContextualTypeForArgument", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
                 index: argIndex,
             });
             return data ? owner.objectRegistry.getOrCreateType(data) : undefined;
@@ -3273,14 +3292,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getAwaitedType", function (type) {
             const data = owner.client.apiRequest("getAwaitedType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
             return data ? owner.objectRegistry.getOrCreateType(data) : undefined;
         }, function* (type) {
             const data = yield* apiRequest("getAwaitedType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
             return data ? owner.objectRegistry.getOrCreateType(data) : undefined;
@@ -3292,14 +3311,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getBaseTypeOfLiteralType", function (type) {
             const data = owner.client.apiRequest("getBaseTypeOfLiteralType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
             return owner.objectRegistry.getOrCreateType(data);
         }, function* (type) {
             const data = yield* apiRequest("getBaseTypeOfLiteralType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
             return owner.objectRegistry.getOrCreateType(data);
@@ -3324,15 +3343,15 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getTypeFromTypeNode", function (node) {
             const data = owner.client.apiRequest("getTypeFromTypeNode", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return owner.objectRegistry.getOrCreateType(data);
         }, function* (node) {
             const data = yield* apiRequest("getTypeFromTypeNode", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return owner.objectRegistry.getOrCreateType(data);
         });
@@ -3343,14 +3362,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getWidenedType", function (type) {
             const data = owner.client.apiRequest("getWidenedType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
             return owner.objectRegistry.getOrCreateType(data);
         }, function* (type) {
             const data = yield* apiRequest("getWidenedType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
             return owner.objectRegistry.getOrCreateType(data);
@@ -3365,7 +3384,7 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getParameterType", function (signature, index) {
             const data = owner.client.apiRequest("getParameterType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 signature: signature.id,
                 index,
             });
@@ -3373,7 +3392,7 @@ export class Checker {
         }, function* (signature, index) {
             const data = yield* apiRequest("getParameterType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 signature: signature.id,
                 index,
             });
@@ -3385,13 +3404,13 @@ export class Checker {
         return cacheGeneratorMethod(owner, "isArrayLikeType", function (type) {
             return owner.client.apiRequest("isArrayLikeType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
         }, function* (type) {
             return yield* apiRequest("isArrayLikeType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
         });
@@ -3401,14 +3420,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "isTypeAssignableTo", function (source, target) {
             return owner.client.apiRequest("isTypeAssignableTo", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 source: source.id,
                 target: target.id,
             });
         }, function* (source, target) {
             return yield* apiRequest("isTypeAssignableTo", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 source: source.id,
                 target: target.id,
             });
@@ -3419,15 +3438,15 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getShorthandAssignmentValueSymbol", function (node) {
             const data = owner.client.apiRequest("getShorthandAssignmentValueSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
         }, function* (node) {
             const data = yield* apiRequest("getShorthandAssignmentValueSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
         });
@@ -3442,17 +3461,17 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getTypeOfSymbolAtLocation", function (symbol, location) {
             const data = owner.client.apiRequest("getTypeOfSymbolAtLocation", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
-                location: getNodeId(location),
+                location: getNodeRequestHandle(location),
             });
             return owner.objectRegistry.getOrCreateType(data);
         }, function* (symbol, location) {
             const data = yield* apiRequest("getTypeOfSymbolAtLocation", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
-                location: getNodeId(location),
+                location: getNodeRequestHandle(location),
             });
             return owner.objectRegistry.getOrCreateType(data);
         });
@@ -3462,13 +3481,13 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getIntrinsicType", function (method) {
             const data = owner.client.apiRequest(method, {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
             return owner.objectRegistry.getOrCreateType(data);
         }, function* (method) {
             const data = yield* apiRequest(method, {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
             return owner.objectRegistry.getOrCreateType(data);
         });
@@ -3574,9 +3593,9 @@ export class Checker {
         return cacheGeneratorMethod(owner, "typeToTypeNode", function (type, enclosingDeclaration, flags) {
             const binaryData = owner.client.apiRequestBinary("typeToTypeNode", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
-                location: enclosingDeclaration ? getNodeId(enclosingDeclaration) : undefined,
+                location: enclosingDeclaration ? getNodeRequestHandle(enclosingDeclaration) : undefined,
                 flags,
             });
             if (!binaryData)
@@ -3585,9 +3604,9 @@ export class Checker {
         }, function* (type, enclosingDeclaration, flags) {
             const binaryData = sourceFileResponseToUint8Array(yield* apiRequest("typeToTypeNode", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
-                location: enclosingDeclaration ? getNodeId(enclosingDeclaration) : undefined,
+                location: enclosingDeclaration ? getNodeRequestHandle(enclosingDeclaration) : undefined,
                 flags,
             }));
             if (!binaryData)
@@ -3600,10 +3619,10 @@ export class Checker {
         return cacheGeneratorMethod(owner, "signatureToSignatureDeclaration", function (signature, kind, enclosingDeclaration, flags) {
             const binaryData = owner.client.apiRequestBinary("signatureToSignatureDeclaration", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 signature: signature.id,
                 kind,
-                location: enclosingDeclaration ? getNodeId(enclosingDeclaration) : undefined,
+                location: enclosingDeclaration ? getNodeRequestHandle(enclosingDeclaration) : undefined,
                 flags,
             });
             if (!binaryData)
@@ -3612,10 +3631,10 @@ export class Checker {
         }, function* (signature, kind, enclosingDeclaration, flags) {
             const binaryData = sourceFileResponseToUint8Array(yield* apiRequest("signatureToSignatureDeclaration", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 signature: signature.id,
                 kind,
-                location: enclosingDeclaration ? getNodeId(enclosingDeclaration) : undefined,
+                location: enclosingDeclaration ? getNodeRequestHandle(enclosingDeclaration) : undefined,
                 flags,
             }));
             if (!binaryData)
@@ -3628,9 +3647,9 @@ export class Checker {
         return cacheGeneratorMethod(owner, "typeToString", function (type, enclosingDeclaration, flags) {
             const result = owner.client.apiRequest("typeToString", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
-                location: enclosingDeclaration ? getNodeId(enclosingDeclaration) : undefined,
+                location: enclosingDeclaration ? getNodeRequestHandle(enclosingDeclaration) : undefined,
                 flags,
             });
             if (typeof result !== "string")
@@ -3639,9 +3658,9 @@ export class Checker {
         }, function* (type, enclosingDeclaration, flags) {
             const result = yield* apiRequest("typeToString", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
-                location: enclosingDeclaration ? getNodeId(enclosingDeclaration) : undefined,
+                location: enclosingDeclaration ? getNodeRequestHandle(enclosingDeclaration) : undefined,
                 flags,
             });
             if (typeof result !== "string")
@@ -3654,14 +3673,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "isContextSensitive", function (node) {
             return owner.client.apiRequest("isContextSensitive", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
         }, function* (node) {
             return yield* apiRequest("isContextSensitive", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
         });
     }
@@ -3670,13 +3689,13 @@ export class Checker {
         return cacheGeneratorMethod(owner, "isArrayType", function (type) {
             return owner.client.apiRequest("isArrayType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
         }, function* (type) {
             return yield* apiRequest("isArrayType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
         });
@@ -3711,13 +3730,13 @@ export class Checker {
         return cacheGeneratorMethod(owner, "isReadonlySymbol", function (symbol) {
             return owner.client.apiRequest("isReadonlySymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
         }, function* (symbol) {
             return yield* apiRequest("isReadonlySymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
         });
@@ -3740,14 +3759,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getRestTypeOfSignature", function (signature) {
             const data = owner.client.apiRequest("getRestTypeOfSignature", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 signature: signature.id,
             });
             return owner.objectRegistry.getOrCreateType(data);
         }, function* (signature) {
             const data = yield* apiRequest("getRestTypeOfSignature", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 signature: signature.id,
             });
             return owner.objectRegistry.getOrCreateType(data);
@@ -3758,7 +3777,7 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getTypePredicateOfSignature", function (signature) {
             const data = owner.client.apiRequest("getTypePredicateOfSignature", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 signature: signature.id,
             });
             if (!data)
@@ -3772,7 +3791,7 @@ export class Checker {
         }, function* (signature) {
             const data = yield* apiRequest("getTypePredicateOfSignature", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 signature: signature.id,
             });
             if (!data)
@@ -3836,7 +3855,7 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getIndexInfoOfType", function (type, kind) {
             const data = owner.client.apiRequest("getIndexInfoOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
                 kind,
             });
@@ -3844,12 +3863,12 @@ export class Checker {
                 keyType: owner.objectRegistry.getOrCreateType(data.keyType),
                 valueType: owner.objectRegistry.getOrCreateType(data.valueType),
                 isReadonly: data.isReadonly ?? false,
-                declaration: data.declaration ? new NodeHandle(data.declaration, owner.project) : undefined,
+                declaration: data.declaration ? owner.objectRegistry.createNodeHandle(data.declaration) : undefined,
             } : undefined;
         }, function* (type, kind) {
             const data = yield* apiRequest("getIndexInfoOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
                 kind,
             });
@@ -3857,7 +3876,7 @@ export class Checker {
                 keyType: owner.objectRegistry.getOrCreateType(data.keyType),
                 valueType: owner.objectRegistry.getOrCreateType(data.valueType),
                 isReadonly: data.isReadonly ?? false,
-                declaration: data.declaration ? new NodeHandle(data.declaration, owner.project) : undefined,
+                declaration: data.declaration ? owner.objectRegistry.createNodeHandle(data.declaration) : undefined,
             } : undefined;
         });
     }
@@ -3874,7 +3893,7 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getTypeOfPropertyOfType", function (type, propertyName) {
             const data = owner.client.apiRequest("getTypeOfPropertyOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
                 name: propertyName,
             });
@@ -3882,7 +3901,7 @@ export class Checker {
         }, function* (type, propertyName) {
             const data = yield* apiRequest("getTypeOfPropertyOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
                 name: propertyName,
             });
@@ -3914,14 +3933,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getBaseConstraintOfType", function (type) {
             const data = owner.client.apiRequest("getBaseConstraintOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
             return data ? owner.objectRegistry.getOrCreateType(data) : undefined;
         }, function* (type) {
             const data = yield* apiRequest("getBaseConstraintOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
             return data ? owner.objectRegistry.getOrCreateType(data) : undefined;
@@ -3932,7 +3951,7 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getPropertyOfType", function (type, name) {
             const data = owner.client.apiRequest("getPropertyOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
                 name,
             });
@@ -3940,7 +3959,7 @@ export class Checker {
         }, function* (type, name) {
             const data = yield* apiRequest("getPropertyOfType", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
                 name,
             });
@@ -3952,8 +3971,8 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getConstantValue", function (node) {
             const data = owner.client.apiRequest("getConstantValue", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             if (!data || (typeof data.value !== "string" && typeof data.value !== "number")) {
                 return undefined;
@@ -3971,8 +3990,8 @@ export class Checker {
         }, function* (node) {
             const data = yield* apiRequest("getConstantValue", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             if (!data || (typeof data.value !== "string" && typeof data.value !== "number")) {
                 return undefined;
@@ -3995,15 +4014,15 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getSignatureFromDeclaration", function (node) {
             const data = owner.client.apiRequest("getSignatureFromDeclaration", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return owner.objectRegistry.getOrCreateSignature(data);
         }, function* (node) {
             const data = yield* apiRequest("getSignatureFromDeclaration", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return owner.objectRegistry.getOrCreateSignature(data);
         });
@@ -4013,15 +4032,15 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getExportSpecifierLocalTargetSymbol", function (node) {
             const data = owner.client.apiRequest("getExportSpecifierLocalTargetSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
         }, function* (node) {
             const data = yield* apiRequest("getExportSpecifierLocalTargetSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
-                location: getNodeId(node),
+                project: owner.project.handle,
+                location: getNodeRequestHandle(node),
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
         });
@@ -4036,14 +4055,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getAliasedSymbol", function (symbol) {
             const data = owner.client.apiRequest("getAliasedSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return owner.objectRegistry.getOrCreateSymbol(data);
         }, function* (symbol) {
             const data = yield* apiRequest("getAliasedSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return owner.objectRegistry.getOrCreateSymbol(data);
@@ -4058,13 +4077,13 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getFullyQualifiedName", function (symbol) {
             return owner.client.apiRequest("getFullyQualifiedName", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
         }, function* (symbol) {
             return yield* apiRequest("getFullyQualifiedName", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
         });
@@ -4074,14 +4093,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getImmediateAliasedSymbol", function (symbol) {
             const data = owner.client.apiRequest("getImmediateAliasedSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
         }, function* (symbol) {
             const data = yield* apiRequest("getImmediateAliasedSymbol", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return data ? owner.objectRegistry.getOrCreateSymbol(data) : undefined;
@@ -4096,7 +4115,7 @@ export class Checker {
             if (symbol.checkFlags & CheckFlags.Instantiated) {
                 const data = owner.client.apiRequest("getTargetSymbol", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     symbol: symbol.reference,
                 });
                 return owner.objectRegistry.getOrCreateSymbol(data);
@@ -4106,7 +4125,7 @@ export class Checker {
             if (symbol.checkFlags & CheckFlags.Instantiated) {
                 const data = yield* apiRequest("getTargetSymbol", {
                     snapshot: owner.snapshotId,
-                    project: owner.project.id,
+                    project: owner.project.handle,
                     symbol: symbol.reference,
                 });
                 return owner.objectRegistry.getOrCreateSymbol(data);
@@ -4119,14 +4138,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getExportSymbolOfSymbol", function (symbol) {
             const data = owner.client.apiRequest("getExportSymbolOfSymbolForChecker", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return owner.objectRegistry.getOrCreateSymbol(data);
         }, function* (symbol) {
             const data = yield* apiRequest("getExportSymbolOfSymbolForChecker", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return owner.objectRegistry.getOrCreateSymbol(data);
@@ -4143,12 +4162,12 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getWellKnownSymbols", function () {
             return owner.wellKnownSymbols ??= owner.client.apiRequest("getWellKnownSymbols", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
         }, function* () {
             return owner.wellKnownSymbols ??= yield* apiRequest("getWellKnownSymbols", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
         });
     }
@@ -4196,12 +4215,12 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getWellKnownSignatures", function () {
             return owner.wellKnownSignatures ??= owner.client.apiRequest("getWellKnownSignatures", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
         }, function* () {
             return owner.wellKnownSignatures ??= yield* apiRequest("getWellKnownSignatures", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
             });
         });
     }
@@ -4223,14 +4242,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getExportsOfModule", function (symbol) {
             const data = owner.client.apiRequest("getExportsOfModule", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return data ? data.map(d => owner.objectRegistry.getOrCreateSymbol(d)) : [];
         }, function* (symbol) {
             const data = yield* apiRequest("getExportsOfModule", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return data ? data.map(d => owner.objectRegistry.getOrCreateSymbol(d)) : [];
@@ -4241,7 +4260,7 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getMemberInModuleExports", function (symbol, name) {
             const data = owner.client.apiRequest("getMemberInModuleExports", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
                 name,
             });
@@ -4249,7 +4268,7 @@ export class Checker {
         }, function* (symbol, name) {
             const data = yield* apiRequest("getMemberInModuleExports", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
                 name,
             });
@@ -4261,14 +4280,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getJsDocTagsOfSymbol", function (symbol) {
             const data = owner.client.apiRequest("getJsDocTags", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return data ?? [];
         }, function* (symbol) {
             const data = yield* apiRequest("getJsDocTags", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
             return data ?? [];
@@ -4279,13 +4298,13 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getDocumentationCommentOfSymbol", function (symbol) {
             return owner.client.apiRequest("getDocumentationComment", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
         }, function* (symbol) {
             return yield* apiRequest("getDocumentationComment", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 symbol: symbol.reference,
             });
         });
@@ -4298,14 +4317,14 @@ export class Checker {
         return cacheGeneratorMethod(owner, "getTypeArguments", function (type) {
             const data = owner.client.apiRequest("getTypeArguments", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
             return data ? data.map(d => owner.objectRegistry.getOrCreateType(d)) : [];
         }, function* (type) {
             const data = yield* apiRequest("getTypeArguments", {
                 snapshot: owner.snapshotId,
-                project: owner.project.id,
+                project: owner.project.handle,
                 type: type.id,
             });
             return data ? data.map(d => owner.objectRegistry.getOrCreateType(d)) : [];
@@ -4364,7 +4383,7 @@ export class Printer {
 }
 export class NodeHandle {
     /**
-     * The project this handle was produced in, used as the default for {@link resolve}.
+     * The project where this handle was first materialized, used as the default for {@link resolve}.
      * Node handles are only meaningful within a project's program, so the producing project
      * is remembered so callers don't have to pass it explicitly.
      */
@@ -4373,11 +4392,15 @@ export class NodeHandle {
     fileOwner;
     index;
     kind;
+    /** Identity of the exact parsed source file, shared across programs that reuse that AST. */
+    sourceFileId;
+    /** Retrieval metadata; never used to substitute a different source-file AST. */
     path;
     constructor(handle, canonicalProject, fileOwner) {
         const parsed = parseNodeHandleFromCompiler(handle);
         this.index = parsed.index;
         this.kind = parsed.kind;
+        this.sourceFileId = parsed.sourceFileId;
         this.path = parsed.path;
         this.canonicalProject = canonicalProject;
         this.fileOwner = fileOwner;
@@ -4386,36 +4409,47 @@ export class NodeHandle {
      * Resolve this handle to the actual AST node by fetching the source file from a project
      * and looking up the node by index. If no project is passed, the project that produced
      * the handle is used. Declarations of file-owned symbols identify an exact source file and
-     * resolve through it, independently of any project.
+     * resolve through it, independently of any project. A different AST at the
+     * same path is never substituted.
      */
     get resolve() {
         const owner = this;
         return cacheGeneratorMethod(owner, "resolve", function (project = owner.canonicalProject) {
             if (owner.fileOwner) {
                 const sourceFile = owner.fileOwner.record.file ?? owner.fetchOwnerFile(owner.fileOwner);
-                return sourceFile.getOrCreateNodeAtIndex(owner.index);
+                return owner.resolveInFile(sourceFile);
             }
             if (!project)
-                throw new Error(`Node handle for '${owner.path}' has no project context`);
+                throw new Error(`Node handle for source file '${owner.sourceFileId}' has no project context`);
             const sourceFile = project.program.getSourceFileByPath(owner.path);
             if (!sourceFile) {
-                return undefined;
+                throw new Error("Node handle source file is not part of the requested program");
             }
-            return sourceFile.getOrCreateNodeAtIndex(owner.index);
+            return owner.resolveInFile(sourceFile);
         }, function* (project = owner.canonicalProject) {
             if (owner.fileOwner) {
                 const sourceFile = owner.fileOwner.record.file ?? (yield* owner.fetchOwnerFile.gen(owner.fileOwner));
-                return sourceFile.getOrCreateNodeAtIndex(owner.index);
+                return owner.resolveInFile(sourceFile);
             }
             if (!project)
-                throw new Error(`Node handle for '${owner.path}' has no project context`);
+                throw new Error(`Node handle for source file '${owner.sourceFileId}' has no project context`);
             const sourceFile = yield* project.program.getSourceFileByPath.gen(owner.path);
             if (!sourceFile) {
-                return undefined;
+                throw new Error("Node handle source file is not part of the requested program");
             }
-            return sourceFile.getOrCreateNodeAtIndex(owner.index);
+            return owner.resolveInFile(sourceFile);
         });
     }
+    resolveInFile(sourceFile) {
+        if (sourceFile.nodeId !== this.sourceFileId) {
+            throw new Error(`Node handle source file is not part of the requested program`);
+        }
+        const node = sourceFile.getOrCreateNodeAtIndex(this.index);
+        if (!node || node.kind !== this.kind) {
+            throw new Error("Node handle does not identify a node of the expected kind");
+        }
+        return node;
+    }
     get fetchOwnerFile() {
         const owner = this;
         return cacheGeneratorMethod(owner, "fetchOwnerFile", function (fileOwner) {
@@ -4444,8 +4478,11 @@ export class Symbol {
     checkFlags;
     /** @internal */
     reference;
-    declarations;
-    valueDeclaration;
+    // Declaration handles are kept in their wire form until first accessed.
+    declarationHandles;
+    valueDeclarationHandle;
+    declarationsCache;
+    valueDeclarationCache;
     parent;
     exportSymbol;
     membersCache;
@@ -4458,19 +4495,31 @@ export class Symbol {
         this.escapedName = data.name;
         this.name = unescapeLeadingUnderscores(data.name);
         this.flags = data.flags;
-        this.checkFlags = data.checkFlags;
-        // A file-owned symbol has no canonical project; its declarations resolve through its file.
-        const project = storage.kind === SymbolOwnerKind.Snapshot ? storage.registry.project : undefined;
-        const fileOwner = storage.kind === SymbolOwnerKind.File ? storage.owner : undefined;
-        this.declarations = (data.declarations ?? []).map(handle => new NodeHandle(handle, project, fileOwner));
-        this.valueDeclaration = data.valueDeclaration
-            ? new NodeHandle(data.valueDeclaration, project, fileOwner)
-            : undefined;
+        this.checkFlags = data.checkFlags ?? 0;
+        this.declarationHandles = data.declarations;
+        this.valueDeclarationHandle = data.valueDeclaration;
+        this.declarationsCache = undefined;
+        this.valueDeclarationCache = undefined;
         if (data.parent !== undefined)
             this.parent = data.parent;
         if (data.exportSymbol !== undefined)
             this.exportSymbol = data.exportSymbol;
     }
+    get declarations() {
+        return this.declarationsCache ??= this.declarationHandles?.map(handle => this.createDeclarationHandle(handle)) ?? [];
+    }
+    get valueDeclaration() {
+        if (this.valueDeclarationCache === undefined && this.valueDeclarationHandle) {
+            this.valueDeclarationCache = this.createDeclarationHandle(this.valueDeclarationHandle);
+        }
+        return this.valueDeclarationCache;
+    }
+    createDeclarationHandle(handle) {
+        // A file-owned symbol has no canonical project; its declarations resolve through its file.
+        return this.storage.kind === SymbolOwnerKind.Snapshot
+            ? this.storage.registry.createNodeHandle(handle)
+            : new NodeHandle(handle, undefined, this.storage.owner);
+    }
     get getParent() {
         const owner = this;
         return cacheGeneratorMethod(owner, "getParent", function () {
@@ -4670,8 +4719,7 @@ class TypeObject {
         this.objectRegistry = objectRegistry;
         this.id = data.id;
         this.flags = data.flags;
-        if (data.objectFlags !== undefined)
-            this.objectFlags = data.objectFlags;
+        this.objectFlags = data.objectFlags ?? 0;
         if (data.symbol !== undefined)
             this.symbol = data.symbol;
         if (data.value != null) {
@@ -4699,8 +4747,7 @@ class TypeObject {
         }
         if (data.intrinsicName !== undefined)
             this.intrinsicName = data.intrinsicName;
-        if (data.isThisType !== undefined)
-            this.isThisType = data.isThisType;
+        this.isThisType = data.isThisType ?? false;
         if (data.freshType !== undefined)
             this.freshType = data.freshType;
         if (data.regularType !== undefined)
@@ -5326,7 +5373,9 @@ export class Signature {
     flags;
     objectRegistry;
     id;
-    declaration;
+    project;
+    declarationHandle;
+    declarationCache;
     typeParameters;
     parameters;
     thisParameter;
@@ -5334,15 +5383,23 @@ export class Signature {
     returnType;
     constructor(data, project, objectRegistry) {
         this.id = data.id;
-        this.flags = data.flags;
+        this.flags = data.flags ?? 0;
         this.objectRegistry = objectRegistry;
-        this.declaration = data.declaration ? new NodeHandle(data.declaration, project) : undefined;
+        this.project = project;
+        this.declarationHandle = data.declaration;
+        this.declarationCache = undefined;
         this.typeParameters = data.typeParameters ?? [];
         this.parameters = data.parameters ?? [];
         this.thisParameter = data.thisParameter;
         this.target = data.target;
         this.returnType = false;
     }
+    get declaration() {
+        if (this.declarationCache === undefined && this.declarationHandle) {
+            this.declarationCache = this.objectRegistry.createNodeHandle(this.declarationHandle);
+        }
+        return this.declarationCache;
+    }
     get getTypeParameters() {
         const owner = this;
         return cacheGeneratorMethod(owner, "getTypeParameters", function () {