@nativescript/vite 8.0.0-alpha.2 → 8.0.0-alpha.3

package/hmr/server/websocket.js

@@ -4,12 +4,11 @@ import { normalizeStrayCoreStringLiterals, fixDanglingCoreFrom, normalizeAnyCore
 import { parse as babelParse } from '@babel/parser';
 import { genCode } from '../helpers/babel.js';
 import babelCore from '@babel/core';
-import pluginTransformTypescript from '@babel/plugin-transform-typescript';
 import traverse from '@babel/traverse';
 // Ensure traverse callable across CJS/ESM builds
 const babelTraverse = traverse?.default || traverse;
 import * as t from '@babel/types';
-import { existsSync, readFileSync } from 'fs';
+import { existsSync, readFileSync, statSync } from 'fs';
 import { astNormalizeModuleImportsAndHelpers, astVerifyAndAnnotateDuplicates } from '../helpers/ast-normalizer.js';
 import { stripRtCoreSentinel, stripDanglingViteCjsImports } from '../helpers/sanitize.js';
 import { WebSocketServer } from 'ws';
@@ -17,7 +16,7 @@ import * as path from 'path';
 import { createHash } from 'crypto';
 import * as PAT from './constants.js';
 import { getVendorManifest, resolveVendorSpecifier } from '../shared/vendor/registry.js';
-import { getPackageJson, getProjectFilePath } from '../../helpers/project.js';
+import { getPackageJson, getProjectFilePath, getProjectRootPath } from '../../helpers/project.js';
 import { loadPrebuiltVendorManifest } from '../shared/vendor/manifest-loader.js';
 import '../vendor-bootstrap.js';
 import { NS_NATIVE_TAGS } from './compiler.js';
@@ -32,13 +31,31 @@ import { astExtractImportsAndStripTypes } from '../helpers/ast-extract.js';
 import { getProjectAppPath, getProjectAppRelativePath, getProjectAppVirtualPath } from '../../helpers/utils.js';
 import { buildRuntimeConfig, generateImportMap } from './import-map.js';
 import { getCliFlags } from '../../helpers/cli-flags.js';
+import { isRuntimeGraphExcludedPath, matchesRuntimeGraphModuleId, normalizeRuntimeGraphPath, shouldIncludeRuntimeGraphFile, shouldSkipRuntimeGraphDirectoryName } from './runtime-graph-filter.js';
+import { resolveAngularCoreHmrImportSource, rewriteAngularEntryRegisterOnly } from './websocket-angular-entry.js';
+import { canonicalizeTransformRequestCacheKey, collectAngularHotUpdateRoots, collectAngularTransformCacheInvalidationUrls, collectAngularTransitiveImportersForInvalidation, collectGraphUpdateModulesForHotUpdate, normalizeHotReloadMatchPath, shouldInvalidateAngularTransitiveImporters, shouldSuppressDefaultViteHotUpdate, shouldSuppressViteFullReloadPayload } from './websocket-angular-hot-update.js';
+import { classifyGraphUpsert, shouldBroadcastGraphUpsertDelta } from './websocket-graph-upsert.js';
+import { extractVitePrebundleId, filterExistingNodeModulesTransformCandidates, getBlockedDeviceNodeModulesReason, getFlattenedManifestMap, isCoreGlobalsReference, isEsmFrameworkPackageSpecifier, isLikelyNativeScriptPluginSpecifier, isLikelyNativeScriptRuntimePluginSpecifier, isNativeScriptCoreModule, isNativeScriptPluginModule, normalizeNativeScriptCoreSpecifier, normalizeNodeModulesSpecifier, resolveCandidateFilePath, resolveInternalRuntimePluginBareSpecifier, resolveNodeModulesPackageBoundary, resolveVendorFromCandidate, resolveVendorRouting, shouldPreserveBareRuntimePluginSubpathImport, stripDecoratedServePrefixes, tryReadRawExplicitJavaScriptModule, viteDepsPathToBareSpecifier, } from './websocket-module-specifiers.js';
+import { ensureNativeScriptModuleBindings, getProcessCodeResolvedSpecifierOverrides } from './websocket-module-bindings.js';
+import { buildVersionedCoreMainBridgeModule, buildVersionedCoreSubpathAliasModule, collectStaticExportNamesFromFile, collectStaticExportOriginsFromFile, ensureVersionedCoreImports, extractDirectExportedNames, hasModuleDefaultExport, normalizeCoreExportOriginsForRuntime, parseCoreBridgeRequest, resolveRuntimeCoreModulePath } from './websocket-core-bridge.js';
+import { createSharedTransformRequestRunner } from './shared-transform-request.js';
+export { ensureNativeScriptModuleBindings, getProcessCodeResolvedSpecifierOverrides } from './websocket-module-bindings.js';
+export { stripDecoratedServePrefixes, tryReadRawExplicitJavaScriptModule } from './websocket-module-specifiers.js';
+export { buildVersionedCoreMainBridgeModule, buildVersionedCoreSubpathAliasModule, collectStaticExportNamesFromFile, collectStaticExportOriginsFromFile, ensureVersionedCoreImports, normalizeCoreExportOriginsForRuntime, parseCoreBridgeRequest } from './websocket-core-bridge.js';
+export { rewriteAngularEntryRegisterOnly } from './websocket-angular-entry.js';
+export { canonicalizeTransformRequestCacheKey, collectAngularHotUpdateRoots, collectAngularTransformCacheInvalidationUrls, collectAngularTransitiveImportersForInvalidation, collectGraphUpdateModulesForHotUpdate, createSharedTransformRequestRunner, normalizeHotReloadMatchPath, shouldInvalidateAngularTransitiveImporters, shouldSuppressDefaultViteHotUpdate, shouldSuppressViteFullReloadPayload, classifyGraphUpsert, shouldBroadcastGraphUpsertDelta };
+const pluginTransformTypescript = (() => {
+    const requireFromHere = createRequire(import.meta.url);
+    const loaded = requireFromHere('@babel/plugin-transform-typescript');
+    return loaded?.default || loaded;
+})();
 // Build a serialized process.env object from CLI --env.* flags.
 // This is injected into every HTTP-served module so app code referencing
 // process.env.TEST_ENV (etc.) works on device in HMR dev mode.
 const __processEnvEntries = { NODE_ENV: 'development' };
 try {
     const flags = getCliFlags();
-    for (const [k, v] of Object.entries(flags)) {
+    for (const [k, v] of Object.entries(flags || {})) {
         // Skip internal NativeScript build flags
         if (['ios', 'android', 'visionos', 'platform', 'hmr', 'verbose'].includes(k))
             continue;
@@ -60,182 +77,46 @@ const STRATEGY_REGISTRY = new Map([
     ['typescript', typescriptServerStrategy],
 ]);
 function resolveFrameworkStrategy(flavor) {
-    return STRATEGY_REGISTRY.get(flavor);
-}
-let ACTIVE_STRATEGY;
-const processSfcCode = createProcessSfcCode(processCodeForDevice);
-// Bare specifiers and special skip patterns (virtual, data:, etc.)
-const VENDOR_PACKAGES = /^[A-Za-z@][^:\/\s]*$/;
-const SKIP_PATTERNS = /^(?:data:|blob:|node:|virtual:|vite:|\0|\/@@?id|\/__vite|__vite|__x00__)/;
-// Minimal helpers to support vendor pre-bundle detection
-function extractVitePrebundleId(spec) {
-    const m = spec.match(/\.vite\/deps\/([^?]+?)\.[mc]?js/);
-    if (m)
-        return m[1];
-    const m2 = spec.match(/__x00__([^?]+?)\.[mc]?js/);
-    if (m2)
-        return m2[1];
-    return null;
-}
-function getFlattenedManifestMap(manifest) {
-    const map = new Map();
-    const mods = Object.keys(manifest.modules || {});
-    for (const canonical of mods) {
-        const flat = canonical.replace(/\./g, '__').replace(/\//g, '_');
-        map.set(flat, canonical);
-        const alias = manifest.aliases?.[canonical];
-        if (alias) {
-            const aliasFlat = String(alias).replace(/\./g, '__').replace(/\//g, '_');
-            map.set(aliasFlat, canonical);
-        }
+    const strategy = STRATEGY_REGISTRY.get(flavor);
+    if (!strategy) {
+        throw new Error(`[ns-hmr] Unsupported framework strategy: ${flavor}`);
     }
-    return map;
-}
-// NativeScript module detectors
-function isCoreGlobalsReference(spec) {
-    return /@nativescript(?:[\/_-])core(?:[\/_-])globals/.test(spec || '');
-}
-function isNativeScriptCoreModule(spec) {
-    return /^(?:@nativescript[\/_-]core|@nativescript\/core)(?:\b|\/)/i.test(spec || '');
-}
-function isNativeScriptPluginModule(spec) {
-    return /^@nativescript\//i.test(spec || '') && !isNativeScriptCoreModule(spec || '');
-}
-function isLikelyNativeScriptRuntimePluginSpecifier(spec) {
-    if (!spec)
-        return false;
-    const s = spec.replace(PAT.QUERY_PATTERN, '');
-    if (/^(?:\.|\/|https?:\/\/)/i.test(s))
-        return false;
-    if (s.startsWith('@@/'))
-        return false;
-    if (s.startsWith('~/'))
-        return false;
-    if (s.startsWith('@/'))
-        return false;
-    if (/\.vue(?:\?|$)/i.test(s))
-        return false;
-    const root = extractRootPackageName(s) || s;
-    if (!root)
-        return false;
-    if (isNativeScriptCoreModule(root))
-        return false;
-    if (/^(?:vue|nativescript-vue)(?:\b|\/)/i.test(root))
-        return false;
-    if (/^@nativescript\//i.test(root))
-        return true;
-    if (/^(?:@nativescript-community|@nstudio|@mleleux)\//i.test(root))
-        return true;
-    return /(?:^|\/)nativescript(?:$|[-_])/i.test(root);
+    return strategy;
 }
-// Looser detector for NativeScript plugin-style specifiers that should be resolved
-// via device require() rather than HTTP during HMR. This includes popular community
-// scopes in addition to @nativescript/* (excluding core).
-function isLikelyNativeScriptPluginSpecifier(spec) {
-    if (!spec)
-        return false;
-    const s = spec.replace(PAT.QUERY_PATTERN, '');
-    // Absolute or relative paths are not bare packages
-    if (/^(?:\.|\/|https?:\/\/)/i.test(s))
-        return false;
-    // App alias paths like '@/...' are not vendor packages
-    if (s.startsWith('@@/'))
-        return false; // extremely rare double '@' alias
-    if (s.startsWith('~/'))
-        return false; // NativeScript tilde alias (app root)
-    if (s.startsWith('@/'))
-        return false; // Common Vite alias for src
-    // .vue SFCs are not vendor packages
-    if (/\.vue(?:\?|$)/i.test(s))
-        return false;
-    // Exclude core and vue runtime which are handled by dedicated bridges
-    if (/^@nativescript\/core(\b|\/)/i.test(s))
-        return false;
-    if (/^(?:vue|nativescript-vue)(?:\b|\/)/i.test(s))
+let ACTIVE_STRATEGY;
+function isSocketClientOpen(client) {
+    if (!client) {
         return false;
-    // Treat any other bare package id as device-resolved (require) during HMR
-    return true;
-}
-export function tryReadRawExplicitJavaScriptModule(spec, projectRoot) {
-    if (!spec || !spec.startsWith('/'))
-        return null;
-    if (spec.startsWith('/@id/') || spec.startsWith('/@fs/'))
-        return null;
-    if (!/\.js$/i.test(spec) || /\.(?:mjs|cjs)$/i.test(spec))
-        return null;
-    // NativeScript runtime plugins rely on Vite's transform pipeline to apply
-    // platform-aware entry resolution and preserve root-entry routing semantics.
-    // Reading their on-disk JS directly recreates raw relative imports such as
-    // `./gesturehandler`, which can reintroduce HTTP ESM cycles during HMR.
-    try {
-        const nodeModulesSpecifier = normalizeNodeModulesSpecifier(spec);
-        if (nodeModulesSpecifier) {
-            const pkgName = extractRootPackageName(nodeModulesSpecifier);
-            if (isLikelyNativeScriptRuntimePluginSpecifier(pkgName)) {
-                return null;
-            }
-        }
     }
-    catch { }
-    const root = path.resolve(projectRoot);
-    const absPath = path.resolve(root, `.${spec}`);
-    const rel = path.relative(root, absPath);
-    if (!rel || rel.startsWith('..') || path.isAbsolute(rel))
-        return null;
-    if (!existsSync(absPath))
-        return null;
+    const openState = typeof client.OPEN === 'number' ? client.OPEN : 1;
+    return client.readyState === openState;
+}
+function getHmrSocketRoleFromRequestUrl(requestUrl) {
     try {
-        const code = readFileSync(absPath, 'utf-8');
-        if (/from\s*['"](?:node:)?module['"]/.test(code) || /\bcreateRequire\b/.test(code)) {
-            return null;
-        }
-        return {
-            code,
-            resolvedId: spec,
-        };
+        const url = new URL(requestUrl || '/ns-hmr', 'http://localhost');
+        return url.searchParams.get('ns_hmr_role') || 'unknown';
     }
     catch {
-        return null;
+        return 'unknown';
     }
 }
-function canonicalizeTransformRequestCacheKey(url, projectRoot) {
-    if (!url)
-        return url;
-    const [rawPath, rawQuery = ''] = url.split('?', 2);
-    let normalizedPath = rawPath;
-    const root = projectRoot ? projectRoot.replace(/\\/g, '/') : '';
-    if (normalizedPath.startsWith('/@fs/')) {
-        const fsPath = normalizedPath.slice('/@fs'.length).replace(/\\/g, '/');
-        if (root && fsPath.startsWith(root)) {
-            const rel = fsPath.slice(root.length);
-            normalizedPath = rel.startsWith('/') ? rel : `/${rel}`;
-        }
-    }
-    else if (root && normalizedPath.replace(/\\/g, '/').startsWith(root)) {
-        const rel = normalizedPath.replace(/\\/g, '/').slice(root.length);
-        normalizedPath = rel.startsWith('/') ? rel : `/${rel}`;
+function getHmrSocketRole(client) {
+    if (!client) {
+        return 'unknown';
     }
-    if (!rawQuery) {
-        return normalizedPath;
-    }
-    const params = new URLSearchParams(rawQuery);
-    params.delete('t');
-    params.delete('v');
-    const kept = Array.from(params.entries()).sort(([leftKey, leftValue], [rightKey, rightValue]) => {
-        if (leftKey === rightKey) {
-            return leftValue.localeCompare(rightValue);
-        }
-        return leftKey.localeCompare(rightKey);
-    });
-    if (!kept.length) {
-        return normalizedPath;
-    }
-    const normalizedQuery = new URLSearchParams();
-    for (const [key, value] of kept) {
-        normalizedQuery.append(key, value);
-    }
-    return `${normalizedPath}?${normalizedQuery.toString()}`;
+    return typeof client.__nsHmrClientRole === 'string' && client.__nsHmrClientRole ? client.__nsHmrClientRole : 'unknown';
+}
+function shouldAllowLocalCoreSanitizerPaths(contextLabel) {
+    return /\bnode_modules\/@nativescript\/vite\/hmr\/(?:client|frameworks)\//.test(contextLabel);
 }
+export function prepareAngularEntryForDevice(code, importerPath, sfcFileMap, depFileMap, projectRoot, verbose = false, outputDirOverrideRel, httpOrigin, resolveVendorAsHttp = false) {
+    const rewrittenCode = rewriteImports(code, importerPath, sfcFileMap, depFileMap, projectRoot, verbose, outputDirOverrideRel, httpOrigin, resolveVendorAsHttp);
+    return rewriteAngularEntryRegisterOnly(rewrittenCode, resolveAngularCoreHmrImportSource(rewrittenCode, httpOrigin));
+}
+const processSfcCode = createProcessSfcCode(processCodeForDevice);
+// Bare specifiers and special skip patterns (virtual, data:, etc.)
+const VENDOR_PACKAGES = /^[A-Za-z@][^:\/\s]*$/;
+const SKIP_PATTERNS = /^(?:data:|blob:|node:|virtual:|vite:|\0|\/@@?id|\/__vite|__vite|__x00__)/;
 const MODULE_IMPORT_ANALYSIS_PLUGINS = ['typescript', 'jsx', 'importMeta', 'topLevelAwait', 'classProperties', 'classPrivateProperties', 'classPrivateMethods', 'decorators-legacy'];
 function collectTopLevelImportRecords(code) {
     if (!code || typeof code !== 'string' || !/\bimport\b/.test(code)) {
@@ -351,953 +232,47 @@ function buildNodeModuleProvenancePrelude(sourceId) {
         const viteDepsMatch = cleaned.match(/(?:^|\/)node_modules\/\.vite\/deps\/([^?#]+)/);
         if (viteDepsMatch?.[1]) {
             normalized = `.vite/deps/${viteDepsMatch[1]}`;
-        }
-    }
-    if (!normalized) {
-        return '';
-    }
-    let packageSpecifier = normalized;
-    let via = 'node_modules';
-    if (normalized.startsWith('.vite/deps/')) {
-        via = 'vite-deps';
-        packageSpecifier = viteDepsPathToBareSpecifier(normalized.slice('.vite/deps/'.length)) || normalized;
-    }
-    const rootPackage = extractRootPackageName(packageSpecifier);
-    if (!rootPackage) {
-        return '';
-    }
-    return `try { const __nsRecord = globalThis.__NS_RECORD_MODULE_PROVENANCE__; if (typeof __nsRecord === 'function') { __nsRecord(${JSON.stringify(rootPackage)}, ${JSON.stringify({ kind: 'http-esm', specifier: packageSpecifier, url: sourceId, via })}); } } catch {}\n`;
-}
-export function collectGraphUpdateModulesForHotUpdate(options) {
-    const targets = new Map();
-    const addTarget = (mod) => {
-        const id = mod?.id?.replace(/\?.*$/, '');
-        if (!id)
-            return;
-        if (!targets.has(id)) {
-            targets.set(id, mod);
-        }
-    };
-    if (options.flavor === 'angular' && /\.(html|htm)$/i.test(options.file)) {
-        for (const mod of options.modules || []) {
-            for (const importer of mod?.importers || []) {
-                const importerId = importer?.id || '';
-                if (/\.[cm]?[jt]sx?(?:$|\?)/i.test(importerId)) {
-                    addTarget(importer);
-                }
-            }
-        }
-        if (!targets.size) {
-            addTarget(options.getModuleById(options.file.replace(/\.(html|htm)$/i, '.ts')));
-            addTarget(options.getModuleById(options.file.replace(/\.(html|htm)$/i, '.js')));
-        }
-        return Array.from(targets.values());
-    }
-    if (!options.file.endsWith('.vue')) {
-        addTarget(options.getModuleById(options.file) || options.getModuleById(options.file + '?vue'));
-    }
-    return Array.from(targets.values());
-}
-export function collectAngularHotUpdateRoots(options) {
-    const roots = [];
-    const seenIds = new Set();
-    const seenObjects = new Set();
-    const addRoot = (mod) => {
-        if (!mod) {
-            return;
-        }
-        if (mod.id) {
-            if (seenIds.has(mod.id)) {
-                return;
-            }
-            seenIds.add(mod.id);
-            roots.push(mod);
-            return;
-        }
-        if (seenObjects.has(mod)) {
-            return;
-        }
-        seenObjects.add(mod);
-        roots.push(mod);
-    };
-    if (/\.(html|htm)$/i.test(options.file)) {
-        for (const mod of collectGraphUpdateModulesForHotUpdate({
-            file: options.file,
-            flavor: 'angular',
-            modules: options.modules,
-            getModuleById: options.getModuleById,
-        })) {
-            addRoot(mod);
-        }
-        return roots;
-    }
-    if (!/\.(m|c)?ts$/i.test(options.file)) {
-        return roots;
-    }
-    for (const mod of options.modules || []) {
-        addRoot(mod);
-    }
-    for (const mod of options.getModulesByFile?.(options.file) || []) {
-        addRoot(mod);
-    }
-    if (!roots.length) {
-        addRoot(options.getModuleById(options.file));
-    }
-    return roots;
-}
-export function collectAngularTransitiveImportersForInvalidation(options) {
-    const visited = new Set();
-    const collected = new Map();
-    const isExcluded = options.isExcluded ?? ((id) => id.includes('/node_modules/'));
-    const maxDepth = Math.max(1, Math.floor(options.maxDepth ?? 16));
-    const normalizeId = (value) => (value ?? '').replace(/\?.*$/, '');
-    const walk = (mod, depth) => {
-        if (!mod || visited.has(mod)) {
-            return;
-        }
-        visited.add(mod);
-        if (depth >= maxDepth) {
-            return;
-        }
-        const importers = mod.importers;
-        if (!importers) {
-            return;
-        }
-        for (const importer of importers) {
-            if (!importer)
-                continue;
-            const importerId = normalizeId(importer.id);
-            if (!importerId) {
-                walk(importer, depth + 1);
-                continue;
-            }
-            if (isExcluded(importerId)) {
-                continue;
-            }
-            if (!collected.has(importerId)) {
-                collected.set(importerId, importer);
-            }
-            walk(importer, depth + 1);
-        }
-    };
-    for (const mod of options.modules || []) {
-        walk(mod, 0);
-    }
-    return Array.from(collected.values());
-}
-export function shouldInvalidateAngularTransitiveImporters(options) {
-    if (options.flavor !== 'angular') {
-        return false;
-    }
-    return /\.(?:html|htm|(m|c)?[jt]sx?)$/i.test(options.file);
-}
-export function shouldSuppressDefaultViteHotUpdate(options) {
-    if (options.flavor !== 'angular') {
-        return false;
-    }
-    return /\.(html|htm|ts)$/i.test(options.file);
-}
-export function normalizeHotReloadMatchPath(raw, root) {
-    let normalized = String(raw || '')
-        .split('?')[0]
-        .replace(/\\/g, '/')
-        .replace(/^file:\/\//, '');
-    if (root) {
-        const rootNormalized = root.replace(/\\/g, '/');
-        if (normalized.startsWith(rootNormalized)) {
-            normalized = normalized.slice(rootNormalized.length);
-        }
-    }
-    if (!normalized.startsWith('/')) {
-        normalized = `/${normalized}`;
-    }
-    return normalized;
-}
-export function shouldSuppressViteFullReloadPayload(options) {
-    const { payload, pendingEntries, root } = options;
-    const now = options.now ?? Date.now();
-    if (!payload || payload.type !== 'full-reload') {
-        return false;
-    }
-    const payloadPath = typeof payload.path === 'string' && payload.path !== '*' ? normalizeHotReloadMatchPath(payload.path, root) : null;
-    const payloadTriggeredBy = typeof payload.triggeredBy === 'string' ? normalizeHotReloadMatchPath(payload.triggeredBy, root) : null;
-    for (const entry of pendingEntries) {
-        if (!entry || entry.expiresAt <= now) {
-            continue;
-        }
-        if (payloadTriggeredBy === entry.absPath || payloadTriggeredBy === entry.relPath || payloadPath === entry.relPath || payloadPath === entry.absPath) {
-            return true;
-        }
-    }
-    return false;
-}
-export function createSharedTransformRequestRunner(transformRequest, onTimeout, options = {}) {
-    const inFlight = new Map();
-    const recentResults = new Map();
-    const cacheGenerations = new Map();
-    const queue = [];
-    const maxConcurrent = Math.max(1, Math.floor(options.maxConcurrent ?? 1));
-    const resultCacheTtlMs = Math.max(0, Math.floor(options.resultCacheTtlMs ?? 0));
-    const getResultCacheKey = options.getResultCacheKey ?? ((url) => url);
-    let activeCount = 0;
-    const getCacheGeneration = (cacheKey) => cacheGenerations.get(cacheKey) ?? 0;
-    const invalidateCacheKey = (cacheKey) => {
-        cacheGenerations.set(cacheKey, getCacheGeneration(cacheKey) + 1);
-        recentResults.delete(cacheKey);
-    };
-    const pruneRecentResults = () => {
-        if (!recentResults.size) {
-            return;
-        }
-        const now = Date.now();
-        for (const [key, entry] of recentResults) {
-            if (entry.expiresAt <= now) {
-                recentResults.delete(key);
-            }
-        }
-    };
-    const rememberRecentResult = (url, result, generation) => {
-        if (!result || resultCacheTtlMs <= 0) {
-            return;
-        }
-        const cacheKey = getResultCacheKey(url);
-        if (getCacheGeneration(cacheKey) !== generation) {
-            return;
-        }
-        recentResults.delete(cacheKey);
-        recentResults.set(cacheKey, {
-            expiresAt: Date.now() + resultCacheTtlMs,
-            result,
-        });
-        if (recentResults.size > 512) {
-            const oldestKey = recentResults.keys().next().value;
-            if (oldestKey) {
-                recentResults.delete(oldestKey);
-            }
-        }
-    };
-    const runNext = () => {
-        while (activeCount < maxConcurrent) {
-            const next = queue.shift();
-            if (!next) {
-                return;
-            }
-            activeCount += 1;
-            next();
-        }
-    };
-    const schedule = (task) => {
-        let resolveStarted = null;
-        const started = new Promise((resolve) => {
-            resolveStarted = resolve;
-        });
-        const execution = new Promise((resolve, reject) => {
-            queue.push(() => {
-                let started;
-                resolveStarted?.();
-                try {
-                    started = Promise.resolve(task());
-                }
-                catch (error) {
-                    started = Promise.reject(error);
-                }
-                started.then(resolve, reject).finally(() => {
-                    activeCount = Math.max(0, activeCount - 1);
-                    runNext();
-                });
-            });
-            runNext();
-        });
-        return { execution, started };
-    };
-    const withTimeout = (entry, url, timeoutMs) => {
-        if (!(timeoutMs > 0)) {
-            return entry.execution;
-        }
-        return entry.started.then(() => new Promise((resolve, reject) => {
-            const timer = setTimeout(() => {
-                try {
-                    onTimeout?.(url, timeoutMs);
-                }
-                catch { }
-            }, timeoutMs);
-            entry.execution.then(resolve, reject).finally(() => {
-                clearTimeout(timer);
-            });
-        }));
-    };
-    const runner = ((url, timeoutMs = 120000) => {
-        pruneRecentResults();
-        const cacheKey = getResultCacheKey(url);
-        const generation = getCacheGeneration(cacheKey);
-        const recent = recentResults.get(cacheKey);
-        if (recent && recent.expiresAt > Date.now()) {
-            return Promise.resolve(recent.result);
-        }
-        const existingExecution = inFlight.get(url);
-        if (existingExecution && existingExecution.generation === generation && existingExecution.cacheKey === cacheKey) {
-            return withTimeout(existingExecution, url, timeoutMs);
-        }
-        const scheduled = schedule(async () => {
-            const result = await Promise.resolve(transformRequest(url));
-            rememberRecentResult(url, result, generation);
-            return result;
-        });
-        let execution;
-        execution = scheduled.execution.finally(() => {
-            if (inFlight.get(url)?.execution === execution) {
-                inFlight.delete(url);
-            }
-        });
-        const entry = { execution, started: scheduled.started, cacheKey, generation };
-        inFlight.set(url, entry);
-        return withTimeout(entry, url, timeoutMs);
-    });
-    runner.invalidate = (url) => {
-        invalidateCacheKey(getResultCacheKey(url));
-    };
-    runner.invalidateMany = (urls) => {
-        for (const url of urls || []) {
-            runner.invalidate(url);
-        }
-    };
-    runner.clear = () => {
-        recentResults.clear();
-        cacheGenerations.clear();
-    };
-    return runner;
-}
-export function ensureNativeScriptModuleBindings(code, options) {
-    // Proceed even if a vendor manifest isn't available; we'll still vendor-bind
-    // likely NativeScript plugin-style specifiers (e.g., 'pinia', '@scope/pkg')
-    // via require() so device can resolve them from the app bundle.
-    const importRegex = /(^|\n)\s*import\s+([\s\S]*?)\s+from\s+["']([^"']+)["'];?/gm;
-    const sideEffectRegex = /(^|\n)\s*import\s+["']([^"']+)["'];?/gm;
-    // Collect non-vendor imports so we can hoist them above the injected vendor prelude.
-    // This ensures any residual ESM imports (like SFCs) remain at the true top-level for parsers
-    // that require imports to precede other statements.
-    const preservedImports = [];
-    const modules = new Map();
-    const getModuleBinding = (canonical) => {
-        let entry = modules.get(canonical);
-        if (!entry) {
-            entry = {
-                default: new Set(),
-                namespace: new Set(),
-                named: [],
-                sideEffectOnly: false,
-            };
-            modules.set(canonical, entry);
-        }
-        return entry;
-    };
-    const parseNamedImports = (clause, binding) => {
-        const inner = clause.replace(/^\{/, '').replace(/\}$/, '');
-        inner
-            .split(',')
-            .map((segment) => segment.trim())
-            .filter(Boolean)
-            .forEach((segment) => {
-            const [imported, local] = segment.split(/\s+as\s+/i).map((s) => s.trim());
-            const resolvedImported = imported;
-            const resolvedLocal = local || imported;
-            if (resolvedImported) {
-                binding.named.push({
-                    imported: resolvedImported,
-                    local: resolvedLocal,
-                });
-            }
-        });
-    };
-    // Handle "import ... from 'x'" forms
-    code = code.replace(importRegex, (full, pfx, clause, rawSpec) => {
-        // Capture original for potential preservation (strip the leading newline to avoid double spacing when hoisted)
-        const original = full.replace(/^\n/, '');
-        // Do not touch type-only imports other than hoisting
-        if (full.trimStart().startsWith('import type')) {
-            preservedImports.push(original);
-            return pfx || '';
-        }
-        const specifier = rawSpec.replace(PAT.QUERY_PATTERN, '');
-        let canonical = resolveVendorFromCandidate(specifier);
-        const runtimePluginSpecifier = isLikelyNativeScriptRuntimePluginSpecifier(canonical || specifier);
-        if (options?.preserveNonPluginVendorImports && !runtimePluginSpecifier) {
-            preservedImports.push(original);
-            return pfx || '';
-        }
-        // If not found in vendor manifest, treat well-known NativeScript plugin-style packages
-        // as require() based modules so the device can resolve them from the app bundle or vendor.
-        if (!canonical && isLikelyNativeScriptPluginSpecifier(specifier)) {
-            canonical = specifier;
-        }
-        // CRITICAL: never vendor-inject @nativescript/core here — preserve for the later core-bridge pass.
-        if (canonical && /^@nativescript\/core(\b|\/)/i.test(canonical)) {
-            preservedImports.push(original);
-            return pfx || '';
-        }
-        if (!canonical) {
-            preservedImports.push(original);
-            return pfx || '';
-        }
-        const binding = getModuleBinding(canonical);
-        const trimmed = String(clause).trim();
-        if (!trimmed) {
-            binding.sideEffectOnly = true;
-            return pfx || ''; // erase the import line
-        }
-        // namespace: import * as ns from 'x'
-        if (trimmed.startsWith('*')) {
-            const m = trimmed.match(/\*\s+as\s+(\w+)/i);
-            if (m?.[1])
-                binding.namespace.add(m[1]);
-            return pfx || '';
-        }
-        // named: import { a, b as c } from 'x'
-        if (trimmed.startsWith('{')) {
-            parseNamedImports(trimmed, binding);
-            return pfx || '';
-        }
-        // default + named: import Default, { a as A } from 'x'
-        if (trimmed.includes(',') && trimmed.includes('{')) {
-            const [defaultPart, namedPart] = trimmed.split(/,(.+)/, 2);
-            const def = defaultPart.trim();
-            if (def)
-                binding.default.add(def);
-            if (namedPart)
-                parseNamedImports(namedPart.trim(), binding);
-            return pfx || '';
-        }
-        // default only
-        binding.default.add(trimmed);
-        return pfx || '';
-    });
-    // Handle side-effect only imports: import 'x'
-    code = code.replace(sideEffectRegex, (full, _pfx, rawSpec) => {
-        const original = full.replace(/^\n/, '');
-        const specifier = rawSpec.replace(PAT.QUERY_PATTERN, '');
-        let canonical = resolveVendorFromCandidate(specifier);
-        const runtimePluginSpecifier = isLikelyNativeScriptRuntimePluginSpecifier(canonical || specifier);
-        if (options?.preserveNonPluginVendorImports && !runtimePluginSpecifier) {
-            preservedImports.push(original);
-            return _pfx || '';
-        }
-        if (!canonical && isLikelyNativeScriptPluginSpecifier(specifier)) {
-            canonical = specifier;
-        }
-        if (canonical && /^@nativescript\/core(\b|\/)/i.test(canonical)) {
-            preservedImports.push(original);
-            return _pfx || '';
-        }
-        if (!canonical) {
-            preservedImports.push(original);
-            return _pfx || '';
-        }
-        const binding = getModuleBinding(canonical);
-        binding.sideEffectOnly = true;
-        return _pfx || '';
-    });
-    // If there are no vendor modules to bind, still hoist preserved imports if any were collected.
-    if (!modules.size) {
-        if (preservedImports.length) {
-            const preserved = preservedImports.join('') + '\n';
-            return preserved + code;
-        }
-        return code;
-    }
-    let injection = 'const __nsVendorRegistry = (globalThis.__nsVendorRegistry ||= new Map());\n';
-    // Soft vendor fallback mode: when a plugin module is not available during HMR, provide a stub so the module can instantiate.
-    // Toggle with globalThis.__NS_VENDOR_SOFT__ (default true)
-    // Use JS-safe global access (no TS casts) to avoid syntax errors on device
-    injection += "const __NS_VENDOR_SOFT__ = (typeof globalThis.__NS_VENDOR_SOFT__ !== 'undefined' ? !!globalThis.__NS_VENDOR_SOFT__ : true);\n";
-    // Provide a require fallback that throws lazily so callers can soft-stub in the catch block.
-    injection += "const __nsVendorRequire = (typeof globalThis.__nsRequire === 'function' ? globalThis.__nsRequire : (typeof globalThis.require === 'function' ? globalThis.require : (spec => { throw new Error('__nsVendorRequire unavailable'); })));\n";
-    // One-time diagnostic if require is missing; avoid spewing on every module
-    injection += "try { (globalThis.__NS_VENDOR_ONCE__ ||= { loggedRequireMissing: false }); if (!globalThis.__NS_VENDOR_ONCE__.loggedRequireMissing && typeof __nsVendorRequire !== 'function') { console.warn('[ns-hmr][vendor][require-missing] using soft stubs=', __NS_VENDOR_SOFT__); globalThis.__NS_VENDOR_ONCE__.loggedRequireMissing = true; } } catch {}\n";
-    injection += "function __nsMissing(name){ try { const fn = function(){ try { console.warn('[ns-hmr][vendor][stub]', name); } catch {} }; return new Proxy(fn, { get: (_t, p) => __nsMissing(name + '.' + String(p)) }); } catch { return {}; } }\n";
-    // Helper utils to simplify robust property/default selection without using optional chaining/nullish
-    injection += "function __nsHasInstall(x){ try { return (typeof x === 'function') || (typeof x === 'object' && x && typeof x.install === 'function'); } catch { return false; } }\n";
-    injection += "function __nsDefault(mod){ try { return (mod && mod['default'] !== undefined) ? mod['default'] : mod; } catch { return mod; } }\n";
-    injection += "function __nsNestedDefault(mod){ try { return (mod && mod.default && (typeof mod.default.default === 'function' || (typeof mod.default.default === 'object' && mod.default.default && typeof mod.default.default.install === 'function'))) ? mod.default.default : undefined; } catch { return undefined; } }\n";
-    injection += "function __nsPick(mod, name){ try { if (mod && mod['default'] && mod['default'][name] !== undefined) return mod['default'][name]; } catch {} try { if (mod && mod[name] !== undefined) return mod[name]; } catch {} try { if (mod && typeof mod['default'] === 'function' && mod['default'].name === name) return mod['default']; } catch {} return undefined; }\n";
-    let index = 0;
-    for (const [canonical, binding] of modules) {
-        const cacheKey = JSON.stringify(canonical);
-        const moduleVar = `__nsVendorModule_${index++}`;
-        injection += `const ${moduleVar} = __nsVendorRegistry.has(${cacheKey}) ? __nsVendorRegistry.get(${cacheKey}) : (() => { try { const mod = __nsVendorRequire(${cacheKey}); __nsVendorRegistry.set(${cacheKey}, mod); return mod; } catch (e) { try { console.error('[ns-hmr][vendor][require-failed]', ${cacheKey}, (e && (e.message||e)) ); } catch {} try { if (__NS_VENDOR_SOFT__) { const stub = __nsMissing(${cacheKey}); __nsVendorRegistry.set(${cacheKey}, stub); return stub; } } catch {} throw e; } })();\n`;
-        binding.namespace.forEach((alias) => {
-            // For namespace imports, expose both the raw module and a default fallback for interop consumers
-            injection += `const ${alias} = ${moduleVar};\n`;
-            injection += `(${alias} && typeof ${alias} === 'object' && !('default' in ${alias})) && (${alias}.default = ${alias});\n`;
-        });
-        if (binding.named.length) {
-            // Bind each named import robustly from either default or namespace using helper.
-            for (const { imported, local } of binding.named) {
-                const localName = local;
-                const importedName = imported;
-                injection += `const ${localName} = __nsPick(${moduleVar}, ${JSON.stringify(importedName)});\n`;
-            }
-        }
-        if (binding.default.size) {
-            // Create one stable default candidate per module and reuse for all default locals
-            const defVar = `${moduleVar}__def`;
-            injection += `const ${defVar} = __nsDefault(${moduleVar});\n`;
-            binding.default.forEach((localName) => {
-                injection += `const ${localName} = (__nsHasInstall(${defVar})
-          ? ${defVar}
-          : (__nsHasInstall(${moduleVar})
-            ? ${moduleVar}
-            : (function(){ const _n = __nsNestedDefault(${moduleVar}); return _n !== undefined ? _n : ${defVar}; })()));\n`;
-            });
-        }
-        if (binding.sideEffectOnly && !binding.namespace.size && !binding.named.length && !binding.default.size) {
-            injection += `void ${moduleVar};\n`;
-        }
-    }
-    injection += '\n';
-    // Hoist preserved non-vendor imports to the very top for maximum ESM compatibility
-    const preserved = preservedImports.length ? preservedImports.join('') + '\n' : '';
-    return preserved + injection + code;
-}
-// Guard any bare dynamic import(spec) occurring in assembled module code.
-// We cannot override native dynamic import globally; for SFC assembler outputs we inline
-// a tiny helper and rewrite "import(" to "__nsDynImport(" to prevent anomalous specs like '@'.
-function guardBareDynamicImports(code) {
-    try {
-        if (!code || typeof code !== 'string')
-            return code;
-        const NEEDLE = /(^|\n)\s*(?:\/\/[^\n]*\n|\/\*[\s\S]*?\*\/\s*)*/;
-        const hasImportCall = /\bimport\s*\(/.test(code);
-        if (!hasImportCall)
-            return code;
-        const helper = "const __nsDynImport = (spec) => { try { if (!spec || spec === '@') { return import(new URL('/ns/m/__invalid_at__.mjs', import.meta.url).href); } } catch {} try { return import(spec); } catch (e) { return Promise.reject(e); } };\n";
-        // Avoid double injection
-        const inject = code.includes('const __nsDynImport =') ? '' : helper;
-        // Replace bare import( ... ) that are not part of 'import.meta' or type-only contexts
-        // Heuristic: replace 'import(' occurrences; skip 'import.meta'
-        const rewritten = code.replace(/\bimport\s*\(/g, '__nsDynImport(');
-        if (rewritten === code && !inject)
-            return code;
-        return inject + rewritten;
-    }
-    catch {
-        return code;
-    }
-}
-function ensureDynamicHmrImportHelper(code) {
-    try {
-        if (!code.includes('__nsDynamicHmrImport('))
-            return code;
-        if (code.includes('const __nsDynamicHmrImport ='))
-            return code;
-        const helper = 'const __nsDynamicHmrImport = (spec) => {\n' +
-            "  const __nsm = '/ns' + '/m';\n" +
-            "  try { if (!spec || spec === '@') { return import(new URL(__nsm + '/__invalid_at__.mjs', import.meta.url).href); } } catch {}\n" +
-            '  try {\n' +
-            "    if (typeof spec === 'string' && spec.startsWith(__nsm + '/')) {\n" +
-            "      if (spec.includes('/__ns_hmr__/')) { return import(new URL(spec, import.meta.url).href); }\n" +
-            '      const g = globalThis;\n' +
-            "      const nonce = typeof g.__NS_HMR_IMPORT_NONCE__ === 'number' ? g.__NS_HMR_IMPORT_NONCE__ : 0;\n" +
-            "      const tag = nonce ? `n${nonce}` : 'live';\n" +
-            "      const nextPath = __nsm + '/__ns_hmr__/' + encodeURIComponent(tag) + spec.slice(__nsm.length);\n" +
-            "      const origin = typeof g.__NS_HTTP_ORIGIN__ === 'string' && /^https?:\\/\\//.test(g.__NS_HTTP_ORIGIN__) ? g.__NS_HTTP_ORIGIN__ : '';\n" +
-            '      return import(origin ? origin + nextPath : new URL(nextPath, import.meta.url).href);\n' +
-            '    }\n' +
-            '  } catch {}\n' +
-            '  return import(spec);\n' +
-            '};\n';
-        return helper + code;
-    }
-    catch {
-        return code;
-    }
-}
-function normalizeNativeScriptCoreSpecifier(spec) {
-    let normalized = spec.replace(/@nativescript[_-]core/gi, '@nativescript/core').replace(/@nativescript\/core\/index\.js$/i, '@nativescript/core/index.js');
-    if (normalized.startsWith('/node_modules/')) {
-        const idx = normalized.toLowerCase().indexOf('@nativescript/core');
-        if (idx !== -1) {
-            normalized = normalized.slice(idx);
-        }
-    }
-    if (normalized.toLowerCase().startsWith('@nativescript/core')) {
-        normalized = normalized.replace(/\?[^"'`]*$/, '');
-    }
-    return normalized;
-}
-export function normalizeNodeModulesSpecifier(spec) {
-    if (!spec) {
-        return null;
-    }
-    let normalized = spec.replace(/\\/g, '/');
-    const idx = normalized.lastIndexOf('/node_modules/');
-    if (idx === -1) {
-        return null;
-    }
-    let subPath = normalized.slice(idx + '/node_modules/'.length);
-    if (!subPath) {
-        return null;
-    }
-    subPath = subPath.replace(PAT.QUERY_PATTERN, '');
-    if (!subPath) {
-        return null;
-    }
-    // Skip Vite pre-bundled deps that we already map to vendor
-    if (subPath.startsWith('.vite/')) {
-        return null;
-    }
-    return subPath.startsWith('/') ? subPath.slice(1) : subPath;
-}
-export function resolveVendorFromCandidate(specifier) {
-    if (!specifier) {
-        return null;
-    }
-    const manifest = getVendorManifest();
-    if (!manifest) {
-        return null;
-    }
-    const cleaned = specifier.replace(PAT.QUERY_PATTERN, '');
-    const direct = resolveVendorSpecifier(cleaned);
-    if (direct) {
-        return direct;
-    }
-    const flattenedId = extractVitePrebundleId(cleaned);
-    if (flattenedId) {
-        const flattenedMap = getFlattenedManifestMap(manifest);
-        const flatMatch = flattenedMap.get(flattenedId);
-        if (flatMatch) {
-            return flatMatch;
-        }
-        for (const [flatKey, canonical] of flattenedMap.entries()) {
-            if (flattenedId === flatKey) {
-                return canonical;
-            }
-            if (flattenedId.startsWith(`${flatKey}_`)) {
-                // The suffix after the flat key represents a subpath.
-                // Convert it back: e.g., "_solid" → "solid", "_store_dist_x" → "store/dist/x"
-                // Only resolve to the root vendor module if it's a file/dist subpath.
-                // Entry-point subpaths (e.g., _solid, _store) have different exports
-                // and must NOT be collapsed to the root.
-                const flatSuffix = flattenedId.slice(flatKey.length + 1);
-                const subpath = flatSuffix.replace(/_/g, '/');
-                if (isFileDistSubpath(subpath)) {
-                    return canonical;
-                }
-                // Check if there's an alias for this subpath entry
-                const aliasKey = `${canonical}/${subpath.split('/')[0]}`;
-                if (manifest.aliases?.[aliasKey] && manifest.modules[manifest.aliases[aliasKey]]) {
-                    return manifest.aliases[aliasKey];
-                }
-                // Entry-point subpath — don't collapse to root
-            }
-        }
-        const guessedId = flattenedId.replace(/__/g, '.').replace(/_/g, '/');
-        if (guessedId && guessedId !== flattenedId) {
-            const guessedCanonical = resolveVendorSpecifier(guessedId);
-            if (guessedCanonical) {
-                return guessedCanonical;
-            }
-            const prefix = findVendorPrefix(guessedId, manifest);
-            if (prefix) {
-                return prefix;
-            }
-        }
-    }
-    const normalizedCore = normalizeNativeScriptCoreSpecifier(cleaned);
-    if (normalizedCore !== cleaned) {
-        const nsCanonical = resolveVendorSpecifier(normalizedCore);
-        if (nsCanonical) {
-            return nsCanonical;
-        }
-    }
-    const nodeModulesSpecifier = normalizeNodeModulesSpecifier(cleaned);
-    if (nodeModulesSpecifier) {
-        const canonical = resolveVendorSpecifier(nodeModulesSpecifier);
-        if (canonical) {
-            return canonical;
-        }
-        const prefix = findVendorPrefix(nodeModulesSpecifier, manifest);
-        if (prefix) {
-            return prefix;
-        }
-    }
-    const prefix = findVendorPrefix(cleaned, manifest);
-    if (prefix) {
-        return prefix;
-    }
-    return null;
-}
-function resolveCandidateFilePath(candidate, projectRoot) {
-    const cleaned = candidate.replace(PAT.QUERY_PATTERN, '');
-    if (!cleaned)
-        return null;
-    const root = path.resolve(projectRoot);
-    let absPath = null;
-    if (cleaned.startsWith('/@fs/')) {
-        absPath = cleaned.slice('/@fs'.length);
-    }
-    else if (cleaned.includes('/node_modules/')) {
-        absPath = path.resolve(root, `.${cleaned}`);
-    }
-    else if (/^(?:[A-Za-z]:)?\//.test(cleaned)) {
-        absPath = path.resolve(cleaned);
-    }
-    if (!absPath) {
-        return null;
-    }
-    const rel = path.relative(root, absPath);
-    if (!rel || rel.startsWith('..') || path.isAbsolute(rel)) {
-        return null;
-    }
-    return existsSync(absPath) ? absPath : null;
-}
-export function filterExistingNodeModulesTransformCandidates(spec, candidates, projectRoot) {
-    const cleanedSpec = spec.replace(PAT.QUERY_PATTERN, '');
-    if (!cleanedSpec.includes('/node_modules/')) {
-        return candidates;
-    }
-    return candidates.filter((candidate) => !!resolveCandidateFilePath(candidate, projectRoot));
-}
-function findVendorPrefix(specifier, manifest) {
-    const { modules, aliases } = manifest;
-    const keys = Object.keys(modules || {});
-    for (const key of keys) {
-        if (specifier === key) {
-            return key;
-        }
-        if (specifier.startsWith(`${key}/`)) {
-            const subpath = specifier.slice(key.length + 1);
-            // Only match file/dist subpaths (e.g., solid-js/dist/dev.js → solid-js).
-            // Entry-point subpaths (e.g., solid-js/store) are separate packages
-            // and must NOT be collapsed to the root vendor module.
-            if (isFileDistSubpath(subpath)) {
-                return key;
-            }
-            // Check if there's an explicit alias for this subpath
-            const aliasKey = `${key}/${subpath.split('/')[0]}`;
-            if (aliases?.[aliasKey] && modules[aliases[aliasKey]]) {
-                return aliases[aliasKey];
-            }
-            // Entry-point subpath with no alias — don't vendor-resolve
-            continue;
-        }
-    }
-    return null;
-}
-/**
- * Convert a Vite .vite/deps/ filename back to a bare specifier with subpath,
- * using the vendor manifest to determine where the package name ends and the
- * subpath begins.
- *
- * e.g., "@nativescript_tanstack-router_solid.js" → "@nativescript/tanstack-router/solid"
- *       "solid-js.js" → "solid-js"
- *
- * Returns null if no known package prefix matches.
- */
-function viteDepsPathToBareSpecifier(depPath) {
-    const manifest = getVendorManifest();
-    if (!manifest)
-        return null;
-    const flatId = extractVitePrebundleId(`.vite/deps/${depPath}`);
-    if (!flatId)
-        return null;
-    const flatMap = getFlattenedManifestMap(manifest);
-    // Try exact match first
-    if (flatMap.has(flatId)) {
-        return flatMap.get(flatId);
-    }
-    // Try prefix match: find the longest matching vendor flat key
-    let bestKey = '';
-    let bestCanonical = '';
-    for (const [flatKey, canonical] of flatMap.entries()) {
-        if (flatId.startsWith(`${flatKey}_`) && flatKey.length > bestKey.length) {
-            bestKey = flatKey;
-            bestCanonical = canonical;
-        }
-    }
-    if (bestKey && bestCanonical) {
-        // Convert the suffix back to a subpath
-        const flatSuffix = flatId.slice(bestKey.length + 1);
-        const subpath = flatSuffix.replace(/_/g, '/');
-        return `${bestCanonical}/${subpath}`;
-    }
-    return null;
-}
-function isFileDistSubpath(subpath) {
-    const firstSegment = subpath.split('/')[0];
-    // Starts with a known build/dist directory segment → file path
-    const FILE_DIST_DIRS = new Set(['dist', 'src', 'lib', 'build', 'esm', 'cjs', 'es', 'umd', 'module', 'bundle', 'output', '_esm', '_cjs']);
-    if (FILE_DIST_DIRS.has(firstSegment)) {
-        return true;
-    }
-    // Single segment with file extension → file path (e.g., "index.js")
-    if (!subpath.includes('/') && /\.[a-zA-Z0-9]+$/.test(subpath)) {
-        return true;
-    }
-    return false;
-}
-// ── Package exports reverse map ──────────────────────────────────────────────
-// Resolves Vite's resolved file paths back to original bare specifiers using
-// the package's own package.json exports field. This eliminates the fragile
-// heuristic that tried to guess main entry vs. subpath from file paths.
-const _exportsReverseMapCache = new Map();
-/**
- * Resolve the concrete file path from a package.json exports condition value.
- * Handles nested condition objects: { "esm2022": { "default": "./file.mjs" } }
- */
-function resolveExportConditionValue(conditions) {
-    if (typeof conditions === 'string')
-        return conditions;
-    if (typeof conditions !== 'object' || conditions === null)
-        return null;
-    const obj = conditions;
-    for (const key of ['esm2022', 'esm', 'esm2015', 'import', 'module', 'default']) {
-        if (key in obj) {
-            const result = resolveExportConditionValue(obj[key]);
-            if (result)
-                return result;
-        }
-    }
-    for (const val of Object.values(obj)) {
-        if (typeof val === 'string')
-            return val;
-    }
-    return null;
-}
-/**
- * Build a reverse map from file paths → bare specifiers for a package.
- *
- * Example for @angular/common:
- *   "fesm2022/common.mjs" → "@angular/common"        (exports["."])
- *   "fesm2022/http.mjs"   → "@angular/common/http"   (exports["./http"])
- *
- * For packages without exports field, uses main/module fields.
- */
-function getExportsReverseMap(pkgName, projectRoot) {
-    const cached = _exportsReverseMapCache.get(pkgName);
-    if (cached)
-        return cached;
-    const map = new Map();
-    try {
-        const pkgJsonPath = path.join(projectRoot, 'node_modules', pkgName, 'package.json');
-        const pkgJson = JSON.parse(readFileSync(pkgJsonPath, 'utf-8'));
-        if (pkgJson.exports && typeof pkgJson.exports === 'object') {
-            for (const [entryPoint, conditions] of Object.entries(pkgJson.exports)) {
-                // Skip wildcard patterns (./locales/*, etc.) and non-JS exports
-                if (entryPoint.includes('*') || entryPoint.endsWith('.json'))
-                    continue;
-                const resolvedPath = resolveExportConditionValue(conditions);
-                if (resolvedPath && typeof resolvedPath === 'string') {
-                    const normalized = resolvedPath.replace(/^\.\//, '');
-                    const bareSpec = entryPoint === '.' ? pkgName : `${pkgName}/${entryPoint.replace(/^\.\//, '')}`;
-                    map.set(normalized, bareSpec);
-                }
-            }
-        }
-        // Fallback: main/module field for packages without exports
-        if (map.size === 0) {
-            for (const field of ['module', 'main']) {
-                const value = pkgJson[field];
-                if (value && typeof value === 'string') {
-                    const normalized = value.replace(/^\.\//, '');
-                    map.set(normalized, pkgName);
-                    // Also store without extension for NativeScript platform resolution
-                    const withoutExt = normalized.replace(/\.[^.]+$/, '');
-                    if (withoutExt !== normalized) {
-                        map.set(withoutExt, pkgName);
-                    }
-                    break;
-                }
-            }
-        }
-    }
-    catch {
-        // Package.json not found or unreadable
+        }
     }
-    _exportsReverseMapCache.set(pkgName, map);
-    return map;
-}
-/**
- * Extract the root package name from a node_modules specifier.
- * "@angular/common/fesm2022/http.mjs" → "@angular/common"
- * "tslib/tslib.es6.mjs" → "tslib"
- */
-function extractRootPackageName(spec) {
-    if (spec.startsWith('@')) {
-        const parts = spec.split('/');
-        return parts.length >= 2 ? `${parts[0]}/${parts[1]}` : spec;
+    if (!normalized) {
+        return '';
     }
-    return spec.split('/')[0];
-}
-/**
- * Determine whether a vendor package import should go through the vendor bridge
- * (bare specifier) or HTTP (full URL), using the package's exports map.
- *
- * Returns:
- *   { route: 'vendor', bareSpec: string }  — use vendor bridge with this bare specifier
- *   { route: 'http' }                      — serve via HTTP
- *   null                                   — not a vendor package
- */
-function resolveVendorRouting(nodeModulesSpec, projectRoot) {
-    const pkgName = extractRootPackageName(nodeModulesSpec);
-    const subpath = nodeModulesSpec.slice(pkgName.length).replace(/^\//, '');
-    const pkgBaseName = pkgName.split('/').pop() || '';
-    const isRootLevelMainEntry = (() => {
-        if (!subpath || subpath.includes('/')) {
-            return false;
-        }
-        const withoutExt = subpath.replace(/\.[^.]+$/, '');
-        const withoutPlatform = withoutExt.replace(/\.(ios|android|visionos)$/i, '');
-        return withoutPlatform === 'index' || withoutPlatform === pkgBaseName;
-    })();
-    // Runtime NativeScript plugins must preserve require()-style loading even when
-    // they are not part of the vendor manifest. Many community packages rely on
-    // singleton side effects or tolerate CommonJS circular initialization that
-    // would fail under plain HTTP ESM evaluation.
-    if (isLikelyNativeScriptRuntimePluginSpecifier(pkgName) && (!subpath || isRootLevelMainEntry)) {
-        return { route: 'vendor', bareSpec: pkgName };
-    }
-    // Check if this package is in the vendor manifest
-    const manifest = getVendorManifest();
-    if (!manifest?.modules?.[pkgName]) {
-        return null;
+    let packageSpecifier = normalized;
+    let via = 'node_modules';
+    if (normalized.startsWith('.vite/deps/')) {
+        via = 'vite-deps';
+        packageSpecifier = viteDepsPathToBareSpecifier(normalized.slice('.vite/deps/'.length)) || normalized;
     }
-    // Platform-specific NativeScript plugin main entries should still use the
-    // vendor bridge so device require() preserves singleton side effects.
-    // Their named/default bindings are synthesized later by
-    // ensureNativeScriptModuleBindings, so they do not rely on ns-vendor:// ESM
-    // exports directly.
-    if (/\.(ios|android|visionos)\.(js|ts|mjs|mts)$/i.test(nodeModulesSpec) && isLikelyNativeScriptRuntimePluginSpecifier(pkgName) && isRootLevelMainEntry) {
-        return { route: 'vendor', bareSpec: pkgName };
+    const rootPackage = resolveNodeModulesPackageBoundary(packageSpecifier, getProjectRootPath()).packageName;
+    if (!rootPackage) {
+        return '';
     }
-    // Other platform-specific files still go via HTTP.
-    if (/\.(ios|android|visionos)\.(js|ts|mjs|mts)$/.test(nodeModulesSpec)) {
-        return { route: 'http' };
+    return `try { const __nsRecord = globalThis.__NS_RECORD_MODULE_PROVENANCE__; if (typeof __nsRecord === 'function') { __nsRecord(${JSON.stringify(rootPackage)}, ${JSON.stringify({ kind: 'http-esm', specifier: packageSpecifier, url: sourceId, via })}); } } catch {}\n`;
+}
+// Guard any bare dynamic import(spec) occurring in assembled module code.
+// We cannot override native dynamic import globally; for SFC assembler outputs we inline
+// a tiny helper and rewrite "import(" to "__nsDynImport(" to prevent anomalous specs like '@'.
+function guardBareDynamicImports(code) {
+    try {
+        if (!code || typeof code !== 'string')
+            return code;
+        const NEEDLE = /(^|\n)\s*(?:\/\/[^\n]*\n|\/\*[\s\S]*?\*\/\s*)*/;
+        const hasImportCall = /\bimport\s*\(/.test(code);
+        if (!hasImportCall)
+            return code;
+        const helper = "const __nsDynImport = (spec) => { try { if (!spec || spec === '@') { return import(new URL('/ns/m/__invalid_at__.mjs', import.meta.url).href); } } catch {} try { return import(spec); } catch (e) { return Promise.reject(e); } };\n";
+        // Avoid double injection
+        const inject = code.includes('const __nsDynImport =') ? '' : helper;
+        // Replace bare import( ... ) that are not part of 'import.meta' or type-only contexts
+        // Heuristic: replace 'import(' occurrences; skip 'import.meta'
+        const rewritten = code.replace(/\bimport\s*\(/g, '__nsDynImport(');
+        if (rewritten === code && !inject)
+            return code;
+        return inject + rewritten;
     }
-    // No subpath → bare package specifier → vendor bridge
-    if (!subpath) {
-        return { route: 'vendor', bareSpec: pkgName };
-    }
-    // Use exports reverse map to detect subpath entries — these MUST go to HTTP
-    // to avoid collapsing e.g. @angular/common/http → @angular/common
-    const reverseMap = getExportsReverseMap(pkgName, projectRoot);
-    const originalSpec = reverseMap.get(subpath);
-    if (originalSpec && originalSpec !== pkgName) {
-        // Subpath entry (e.g., fesm2022/http.mjs → @angular/common/http) → HTTP
-        return { route: 'http' };
-    }
-    // For vendor routing, only use the vendor bridge for root-level main entries
-    // (single-segment paths like "index.js", "tslib.es6.mjs"). Multi-segment
-    // build output paths (fesm2022/core.mjs, dist/index.js) go to HTTP even if
-    // they ARE the main entry — the ns-vendor:// protocol in HMR mode does not
-    // reliably serve all named ES exports for complex packages.
-    if (!subpath.includes('/')) {
-        const lastSegment = subpath.replace(/\.[^.]+$/, '');
-        if (lastSegment === 'index' || lastSegment === pkgBaseName || lastSegment.startsWith(pkgBaseName + '.')) {
-            return { route: 'vendor', bareSpec: pkgName };
-        }
+    catch {
+        return code;
     }
-    // Default: HTTP — safe for all module types and preserves all named exports
-    return { route: 'http' };
 }
 function stripCoreGlobalsImports(code) {
     const pattern = /^\s*(?:import\s+(?:[^'"\n]*from\s+)?|export\s+\*\s+from\s+)["'][^"']*(?:@nativescript(?:[/_-])core(?:[\/_-])globals|@nativescript_core_globals)[^"']*["'];?\s*$/gm;
@@ -1326,18 +301,14 @@ function ensureVariableDynamicImportHelper(code) {
         `};\n`;
     return `${helper}${code}`;
 }
-// Final safety net for plain dynamic import(expressions) that might slip through
-// Vite's helper transformation. We rewrite occurrences of `import(` to `__ns_import(`
-// and inject a small wrapper that maps the anomalous request '@' to a harmless stub.
 function ensureGuardPlainDynamicImports(code, origin) {
     try {
         if (!code || !/\bimport\s*\(/.test(code))
             return code;
-        const w = `const __ns_import = (s) => { try { if (s === '@') { return import(new URL('/ns/m/__invalid_at__.mjs', import.meta.url).href); } } catch {} return import(s); }\n`;
-        // Replace only when `import(` is not part of an identifier or property (no preceding "." or word char)
+        const wrapper = `const __ns_import = (s) => { try { if (s === '@') { return import(new URL('/ns/m/__invalid_at__.mjs', import.meta.url).href); } } catch {} return import(s); }\n`;
         const replaced = code.replace(/(^|[^\.\w$])import\s*\(/g, (_m, p1) => `${p1}__ns_import(`);
         if (replaced !== code) {
-            return w + replaced;
+            return wrapper + replaced;
         }
         return code;
     }
@@ -1345,26 +316,49 @@ function ensureGuardPlainDynamicImports(code, origin) {
         return code;
     }
 }
-/**
- * Expand `export * from "url"` into explicit named re-exports.
- *
- * NativeScript's HTTP ESM loader on iOS/Android may not correctly propagate
- * `export * from` re-exports across HTTP module boundaries — the importing
- * module's namespace object gets only direct exports, missing re-exported
- * names. This function resolves each `export * from` by fetching the target
- * module, scanning for its named exports, and replacing the star export with
- * explicit `export { name1, name2, ... } from "url"`.
- *
- * Only expands star exports pointing to node_modules HTTP URLs to avoid
- * unnecessary work for app source files (which are typically not re-exported).
- */
+function ensureDynamicHmrImportHelper(code) {
+    try {
+        if (!code.includes('__nsDynamicHmrImport('))
+            return code;
+        if (code.includes('const __nsDynamicHmrImport ='))
+            return code;
+        const helper = 'const __nsDynamicHmrImport = (spec) => {\n' +
+            "  const __nsm = '/ns' + '/m';\n" +
+            "  const __nsBootPrefix = typeof import.meta !== 'undefined' && import.meta && typeof import.meta.url === 'string' && import.meta.url.includes('/__ns_boot__/b1/') ? '/__ns_boot__/b1' : '';\n" +
+            "  const __nsImporterTagMatch = typeof import.meta !== 'undefined' && import.meta && typeof import.meta.url === 'string' ? import.meta.url.match(/\\/__ns_hmr__\\/([^/]+)\\//) : null;\n" +
+            "  const __nsImporterTag = __nsImporterTagMatch && __nsImporterTagMatch[1] ? decodeURIComponent(__nsImporterTagMatch[1]) : '';\n" +
+            "  try { if (!spec || spec === '@') { return import(new URL(__nsm + '/__invalid_at__.mjs', import.meta.url).href); } } catch {}\n" +
+            '  try {\n' +
+            "    if (typeof spec === 'string' && spec.startsWith(__nsm + '/')) {\n" +
+            '      const g = globalThis;\n' +
+            "      const graphVersion = typeof g.__NS_HMR_GRAPH_VERSION__ === 'number' ? g.__NS_HMR_GRAPH_VERSION__ : 0;\n" +
+            "      const nonce = typeof g.__NS_HMR_IMPORT_NONCE__ === 'number' ? g.__NS_HMR_IMPORT_NONCE__ : 0;\n" +
+            "      const __nsActiveBootPrefix = graphVersion || nonce ? '' : __nsBootPrefix;\n" +
+            "      if (spec.includes('/__ns_hmr__/')) {\n" +
+            "        const __preservedSpec = !nonce && __nsBootPrefix && spec.startsWith(__nsm + '/__ns_hmr__/') && !spec.includes('/node_modules/') ? __nsm + __nsBootPrefix + spec.slice(__nsm.length) : spec;\n" +
+            '        return import(new URL(__preservedSpec, import.meta.url).href);\n' +
+            '      }\n' +
+            "      if (spec.startsWith(__nsm + '/node_modules/')) { return import(new URL(spec, import.meta.url).href); }\n" +
+            "      const tag = nonce ? `n${nonce}` : (graphVersion ? `v${graphVersion}` : (__nsImporterTag || 'live'));\n" +
+            "      const nextPath = __nsm + __nsActiveBootPrefix + '/__ns_hmr__/' + encodeURIComponent(tag) + spec.slice(__nsm.length);\n" +
+            "      const origin = typeof g.__NS_HTTP_ORIGIN__ === 'string' && /^https?:\\/\\//.test(g.__NS_HTTP_ORIGIN__) ? g.__NS_HTTP_ORIGIN__ : '';\n" +
+            '      return import(origin ? origin + nextPath : new URL(nextPath, import.meta.url).href);\n' +
+            '    }\n' +
+            '  } catch {}\n' +
+            '  return import(spec);\n' +
+            '};\n';
+        return helper + code;
+    }
+    catch {
+        return code;
+    }
+}
 async function expandStarExports(code, server, projectRoot, verbose) {
     const STAR_RE = /^[ \t]*(export\s+\*\s+from\s+["'])([^"']+)(["'];?)[ \t]*$/gm;
     let match;
     const replacements = [];
     while ((match = STAR_RE.exec(code)) !== null) {
         const url = match[2];
-        // Only expand node_modules star exports served over HTTP
         if (!url.includes('/node_modules/'))
             continue;
         replacements.push({ full: match[0], url, prefix: match[1], suffix: match[3] });
@@ -1373,88 +367,33 @@ async function expandStarExports(code, server, projectRoot, verbose) {
         return code;
     for (const rep of replacements) {
         try {
-            // Strip HTTP origin to get a Vite-resolvable path
             let vitePath = rep.url.replace(/^https?:\/\/[^/]+/, '');
-            // Strip /ns/m/ prefix to get the node_modules path
             vitePath = vitePath.replace(/^\/ns\/m\//, '/');
-            // Strip boot-path prefix used during initial HTTP boot progress tracking.
             vitePath = vitePath.replace(/^\/__ns_boot__\/[^/]+/, '');
-            // Strip HMR cache-busting path segments
             vitePath = vitePath.replace(/\/__ns_hmr__\/[^/]+/, '');
-            const r = await server.transformRequest(vitePath);
-            if (!r?.code)
+            const result = await server.transformRequest(vitePath);
+            if (!result?.code)
                 continue;
-            const names = extractExportedNames(r.code);
+            const names = extractExportedNames(result.code);
             if (!names.length)
                 continue;
-            // Replace `export * from "url"` with explicit named re-exports
             const explicit = `export { ${names.join(', ')} } from ${JSON.stringify(rep.url)};`;
             code = code.replace(rep.full, explicit);
             if (verbose) {
-                console.log(`[ns/m] expanded export* → ${names.length} names from ${vitePath}`);
+                console.log(`[ns/m] expanded export* -> ${names.length} names from ${vitePath}`);
             }
         }
         catch { }
     }
     return code;
 }
-/**
- * Extract named export identifiers from a module's source code.
- * Handles: export function/class/const/let/var NAME, export { NAME },
- * export { NAME as ALIAS }, and export * from (recursive marker).
- * Does NOT follow `export * from` chains — only direct exports.
- */
 function extractExportedNames(code) {
-    const names = new Set();
-    // export function NAME / export class NAME / export async function NAME
-    const declRe = /\bexport\s+(?:async\s+)?(?:function|class)\s+([A-Za-z_$][\w$]*)/g;
-    let m;
-    while ((m = declRe.exec(code)) !== null) {
-        names.add(m[1]);
-    }
-    // export const/let/var NAME (handles destructuring and multiple declarators)
-    const varRe = /\bexport\s+(?:const|let|var)\s+([^=;{]+)/g;
-    while ((m = varRe.exec(code)) !== null) {
-        // Simple case: `export const foo = ...`
-        const decl = m[1].trim();
-        // Could be `{ a, b }` (destructuring) or `foo, bar` (multiple) or just `foo`
-        if (decl.startsWith('{')) {
-            const inner = decl.replace(/^\{|\}$/g, '');
-            for (const part of inner.split(',')) {
-                const name = part.split(':')[0].trim(); // handle { orig: alias }
-                if (/^[A-Za-z_$][\w$]*$/.test(name))
-                    names.add(name);
-            }
-        }
-        else {
-            const name = decl.split(/[\s,=]/)[0].trim();
-            if (/^[A-Za-z_$][\w$]*$/.test(name))
-                names.add(name);
-        }
-    }
-    // export { NAME, NAME as ALIAS, ... } (without `from`)
-    // and export { NAME, ... } from "..." (re-exports)
-    const braceRe = /\bexport\s*\{([^}]+)\}/g;
-    while ((m = braceRe.exec(code)) !== null) {
-        for (const part of m[1].split(',')) {
-            const trimmed = part.trim();
-            // `name as alias` → use alias; `name` → use name
-            const asMatch = trimmed.match(/\S+\s+as\s+(\S+)/);
-            const name = asMatch ? asMatch[1] : trimmed.split(/\s/)[0];
-            if (name && /^[A-Za-z_$][\w$]*$/.test(name) && name !== 'default') {
-                names.add(name);
-            }
-        }
-    }
-    return Array.from(names);
+    return extractDirectExportedNames(code);
 }
-// Heal accidental "import ... = expr" assignments produced by upstream transforms.
-// These are invalid JS; convert to equivalent const assignments.
 function repairImportEqualsAssignments(code) {
     try {
         if (!code || typeof code !== 'string')
             return code;
-        // import { a, b as c } = expr; -> const { a, b: c } = expr;
         code = code.replace(/(^|\n)\s*import\s*\{([^}]+)\}\s*=\s*([^;]+);?/g, (_m, p1, specList, rhs) => {
             const cleaned = String(specList)
                 .split(',')
@@ -1464,61 +403,28 @@ function repairImportEqualsAssignments(code) {
                 .join(', ');
             return `${p1}const { ${cleaned} } = ${rhs};`;
         });
-        // import * as ns = expr; -> const ns = (expr);
-        code = code.replace(/(^|\n)\s*import\s*\*\s*as\s*([A-Za-z_$][\w$]*)\s*=\s*([^;]+);?/g, (_m, p1, ns, rhs) => {
-            return `${p1}const ${ns} = (${rhs});`;
-        });
-        // import name = expr; -> const name = expr;
-        code = code.replace(/(^|\n)\s*import\s+([A-Za-z_$][\w$]*)\s*=\s*([^;]+);?/g, (_m, p1, id, rhs) => {
-            return `${p1}const ${id} = ${rhs};`;
-        });
+        code = code.replace(/(^|\n)\s*import\s*\*\s*as\s*([A-Za-z_$][\w$]*)\s*=\s*([^;]+);?/g, (_m, p1, ns, rhs) => `${p1}const ${ns} = (${rhs});`);
+        code = code.replace(/(^|\n)\s*import\s+([A-Za-z_$][\w$]*)\s*=\s*([^;]+);?/g, (_m, p1, id, rhs) => `${p1}const ${id} = ${rhs};`);
     }
     catch { }
     return code;
 }
-// Ensure imports of the NativeScript-Vue runtime bridge '/ns/rt' are versioned to
-// bust the device HTTP loader cache whenever the HMR graph version increments.
 function ensureVersionedRtImports(code, origin, ver) {
     if (!code || !origin || !Number.isFinite(ver))
         return code;
-    // Static imports: import { ... } from ".../ns/rt" (plus optional version)
     code = code.replace(/(from\s+["'])(?:https?:\/\/[^"']+)?\/(?:\ns|ns)\/rt(?:\/[\d]+)?(["'])/g, (_m, p1, p3) => `${p1}/ns/rt/${ver}${p3}`);
-    // Dynamic imports: import(".../ns/rt") (plus optional version)
     code = code.replace(/(import\(\s*["'])(?:https?:\/\/[^"']+)?\/(?:\@ns|ns)\/rt(?:\/[\d]+)?(["']\s*\))/g, (_m, p1, p3) => `${p1}/ns/rt/${ver}${p3}`);
     return code;
 }
-// Ensure imports of @nativescript/core resolve via the unified /ns/core bridge to keep a single realm
-function ensureVersionedCoreImports(code, origin, ver) {
-    try {
-        // Static imports already handled in rewriteImports; just ensure absolute origin prefix and version
-        code = code.replace(/(["'])\/ns\/core(\?p=[^"']+)?\1/g, (_m, q, qp) => `${q}/ns/core/${ver}${qp || ''}${q}`);
-        // Dynamic imports already handled in rewriteImports; ensure origin and version
-        code = code.replace(/import\(\s*(["'])\/ns\/core(\?p=[^"']+)?\1\s*\)/g, (_m, q, qp) => `import(${q}/ns/core/${ver}${qp || ''}${q})`);
-    }
-    catch { }
-    return code;
-}
-export function buildVersionedCoreSubpathAliasModule(sub, ver) {
-    const normalizedSub = (sub || '').replace(/^\/+/, '');
-    const canonicalUrl = `/ns/core/${ver}?p=${normalizedSub}`;
-    return `import * as __ns_core_alias from ${JSON.stringify(canonicalUrl)};\n` + `export default (__ns_core_alias.default || __ns_core_alias);\n` + `export * from ${JSON.stringify(canonicalUrl)};\n`;
-}
-// Hardened removal of Vite's virtual dynamic-import-helper. Some variants (side-effect only
-// or minified forms) slipped past earlier regexes causing runtime attempts to resolve
-// /@id/__x00__vite/dynamic-import-helper.js which does not exist in the device mirror.
-// We aggressively strip any reference and inline a helper if necessary.
 function stripViteDynamicImportVirtual(code) {
     if (!/\/@id\/__x00__vite\/dynamic-import-helper/.test(code)) {
         return code;
     }
     const original = code;
-    // Remove any import lines referencing the virtual helper (with or without bindings)
     code = code.replace(/^[\t ]*import[^\n]*\/@id\/__x00__vite\/dynamic-import-helper[^\n]*$/gm, '');
-    // If any raw spec strings remain (e.g. concatenated), neutralize them
     if (/\/@id\/__x00__vite\/dynamic-import-helper/.test(code)) {
         code = code.replace(/\/@id\/__x00__vite\/dynamic-import-helper[^"'`)]*/g, '/__NS_UNUSED_DYNAMIC_IMPORT_HELPER__');
     }
-    // Ensure helper present
     if (!/__variableDynamicImportRuntimeHelper/.test(code)) {
         const inline = `const __variableDynamicImportRuntimeHelper = (map, request, importMode) => {\n  try { if (request === '@') { return import('/ns/m/__invalid_at__.mjs'); } } catch {}\n  const loader = map && (map[request] || map[request?.replace(/\\\\/g, '/')]);\n  if (!loader) { const e = new Error('Cannot dynamically import: ' + request); /*@ts-ignore*/ e.code = 'ERR_MODULE_NOT_FOUND'; return Promise.reject(e); }\n  try { return loader(importMode); } catch (e) { return Promise.reject(e); }\n};\n`;
         code = inline + code;
@@ -1528,17 +434,7 @@ function stripViteDynamicImportVirtual(code) {
     }
     return code;
 }
-// Small snippet injected into device-delivered modules to capture any require('http(s)://') calls
 const REQUIRE_GUARD_SNIPPET = `// [guard] install require('http(s)://') detector\n(()=>{try{var g=globalThis;if(g.__NS_REQUIRE_GUARD_INSTALLED__){}else{var mk=function(o,l){return function(){try{var s=arguments[0];if(typeof s==='string'&&/^(?:https?:)\\/\\//.test(s)){var e=new Error('[ns-hmr][require-guard] require of URL: '+s+' via '+l);try{console.error(e.message+'\\n'+(e.stack||''));}catch(e2){}try{g.__NS_REQUIRE_GUARD_LAST__={spec:s,stack:e.stack,label:l,ts:Date.now()};}catch(e3){}}}catch(e1){}return o.apply(this, arguments);};};if(typeof g.require==='function'&&!g.require.__NS_REQ_GUARDED__){var o1=g.require;g.require=mk(o1,'require');g.require.__NS_REQ_GUARDED__=true;}if(typeof g.__nsRequire==='function'&&!g.__nsRequire.__NS_REQ_GUARDED__){var o2=g.__nsRequire;g.__nsRequire=mk(o2,'__nsRequire');g.__nsRequire.__NS_REQ_GUARDED__=true;}g.__NS_REQUIRE_GUARD_INSTALLED__=true;}}catch(e){}})();\n`;
-// ============================================================================
-// HELPER FUNCTIONS
-// ============================================================================
-// Origin invariant: we own both client and server. All URLs must use an explicit
-// http(s)://host:port origin with no trailing slash. Build it deterministically
-// where needed; do not post-sanitize.
-/**
- * Check if an import spec should be remapped to dep-*.mjs
- */
 function shouldRemapImport(spec) {
     if (!spec || typeof spec !== 'string')
         return false;
@@ -1559,12 +455,9 @@ function shouldRemapImport(spec) {
     }
     return true;
 }
-// (legacy wrapSfcWithStableDefault removed; full SFCs now delegate to /ns/asm)
 function removeNamedImports(code, names) {
     const regex = /^(\s*import\s*\{)([^}]*)(\}\s*from\s*['"][^'"]+['"];?)/gm;
     return code.replace(regex, (_m, p1, specList, p3) => {
-        // Only strip for known globalized framework sources (Vue/Nativescript-Vue).
-        // Keep imports from all other packages (Pinia, third-party libs, app modules) intact.
         const srcMatch = /from\s*['"]\s*([^'"\s]+)\s*['"]/i.exec(_m);
         const src = (srcMatch?.[1] || '').toLowerCase();
         const isVueSource = /^(?:vue|nativescript-vue)(?:\b|\/)/i.test(src);
@@ -1663,7 +556,7 @@ function normalizeImportPath(spec, importerDir) {
     else if (spec.startsWith('./') || spec.startsWith('../')) {
         key = path.posix.normalize(path.posix.join(importerDir, spec));
         if (!key.startsWith('/')) {
-            key = '/' + key;
+            key = `/${key}`;
         }
     }
     else {
@@ -1730,6 +623,70 @@ function findDependencyFileName(depFileMap, key) {
     }
     return undefined;
 }
+function isRuntimePluginRootEntrySpecifier(specifier, projectRoot) {
+    if (!specifier) {
+        return false;
+    }
+    const cleaned = specifier.replace(PAT.QUERY_PATTERN, '');
+    const normalized = normalizeNodeModulesSpecifier(cleaned) || cleaned.replace(/^\/+/, '');
+    if (!normalized) {
+        return false;
+    }
+    const { packageName, subpath } = resolveNodeModulesPackageBoundary(normalized, projectRoot);
+    if (!packageName || !isLikelyNativeScriptRuntimePluginSpecifier(packageName, projectRoot)) {
+        return false;
+    }
+    if (!subpath) {
+        return true;
+    }
+    if (subpath.includes('/')) {
+        return false;
+    }
+    const pkgBaseName = packageName.split('/').pop() || '';
+    const withoutExt = /(?:\.(?:ios|android|visionos))?\.(?:ts|tsx|js|jsx|mjs|mts|cts)$/i.test(subpath) ? subpath.replace(/\.[^.]+$/, '') : subpath;
+    const withoutPlatform = withoutExt.replace(/\.(ios|android|visionos)$/i, '');
+    return withoutPlatform === 'index' || withoutPlatform === pkgBaseName;
+}
+function collectMixedRuntimePluginHttpRootPackages(code, projectRoot) {
+    const nonRootSubpathPackages = new Set();
+    const rootEntryPackages = new Set();
+    const visitSpecifier = (rawSpecifier) => {
+        if (!rawSpecifier) {
+            return;
+        }
+        const specifier = normalizeNativeScriptCoreSpecifier(rawSpecifier).replace(PAT.QUERY_PATTERN, '');
+        if (!specifier) {
+            return;
+        }
+        if (/^https?:\/\//.test(specifier) || specifier.startsWith('/ns/')) {
+            return;
+        }
+        if (/^(?:\.|\/)/.test(specifier) && !specifier.includes('/node_modules/')) {
+            return;
+        }
+        const normalized = normalizeNodeModulesSpecifier(specifier) || specifier.replace(/^\/+/, '');
+        if (!normalized) {
+            return;
+        }
+        const { packageName } = resolveNodeModulesPackageBoundary(normalized, projectRoot);
+        if (!packageName || !isLikelyNativeScriptRuntimePluginSpecifier(packageName, projectRoot)) {
+            return;
+        }
+        if (isRuntimePluginRootEntrySpecifier(normalized, projectRoot)) {
+            rootEntryPackages.add(packageName);
+            return;
+        }
+        nonRootSubpathPackages.add(packageName);
+    };
+    for (const pattern of [PAT.IMPORT_PATTERN_1, PAT.IMPORT_PATTERN_2, PAT.IMPORT_PATTERN_3, PAT.IMPORT_PATTERN_SIDE_EFFECT]) {
+        pattern.lastIndex = 0;
+        let match;
+        while ((match = pattern.exec(code)) !== null) {
+            visitSpecifier(match[2]);
+        }
+    }
+    return new Set(Array.from(nonRootSubpathPackages).filter((packageName) => rootEntryPackages.has(packageName)));
+}
 function collectImportDependencies(code, importerPath) {
     const importerDir = path.posix.dirname(importerPath);
     const deps = new Set();
@@ -1928,6 +885,59 @@ function toAppModuleBaseId(importPath, projectRoot) {
     const base = projectRelative.replace(/\.mjs$/i, '');
     return `/${base}`;
 }
+function toNodeModulesHttpModuleId(importPath) {
+    const nodeModulesSpecifier = normalizeNodeModulesSpecifier(importPath);
+    if (!nodeModulesSpecifier) {
+        return null;
+    }
+    return `/ns/m/node_modules/${nodeModulesSpecifier}`;
+}
+export function rewriteNsMImportPathForHmr(p, ver, bootTaggedRequest) {
+    const toHmrServeTag = (value) => {
+        const raw = String(value ?? '').trim();
+        if (!raw) {
+            return 'v0';
+        }
+        if (raw === 'live' || /^n\d+$/i.test(raw) || /^v[^/]+$/i.test(raw)) {
+            return raw;
+        }
+        if (/^\d+$/.test(raw)) {
+            return `v${raw}`;
+        }
+        return raw;
+    };
+    if (!p || !p.startsWith('/ns/m/')) {
+        return p;
+    }
+    const canonicalNodeModulesPath = p.replace(/^\/ns\/m\/__ns_boot__\/b1\/__ns_hmr__\/[^/]+\/node_modules\//, '/ns/m/node_modules/').replace(/^\/ns\/m\/__ns_hmr__\/[^/]+\/node_modules\//, '/ns/m/node_modules/');
+    if (canonicalNodeModulesPath.startsWith('/ns/m/node_modules/')) {
+        return canonicalNodeModulesPath;
+    }
+    if (canonicalNodeModulesPath.startsWith('/ns/m/__ns_boot__/')) {
+        return canonicalNodeModulesPath;
+    }
+    if (canonicalNodeModulesPath.startsWith('/ns/m/__ns_hmr__/')) {
+        return bootTaggedRequest ? `/ns/m/__ns_boot__/b1${canonicalNodeModulesPath.slice('/ns/m'.length)}` : canonicalNodeModulesPath;
+    }
+    const tag = toHmrServeTag(ver);
+    const hmrPrefix = `/ns/m/__ns_hmr__/${tag}`;
+    const bootHmrPrefix = `/ns/m/__ns_boot__/b1/__ns_hmr__/${tag}`;
+    return (bootTaggedRequest ? bootHmrPrefix : hmrPrefix) + canonicalNodeModulesPath.slice('/ns/m'.length);
+}
+function getNumericServeVersionTag(tag, fallback) {
+    const raw = String(tag || '').trim();
+    if (!raw) {
+        return fallback;
+    }
+    const versionMatch = raw.match(/^v(\d+)$/);
+    if (versionMatch?.[1]) {
+        return Number(versionMatch[1]);
+    }
+    if (/^\d+$/.test(raw)) {
+        return Number(raw);
+    }
+    return fallback;
+}
 function normalizeAbsoluteFilesystemImport(spec, importerPath, projectRoot) {
     if (!spec || typeof spec !== 'string') {
         return null;
@@ -2109,8 +1119,13 @@ export function wrapCommonJsModuleForDevice(code) {
 /**
  * Process code for device: inject globals, remove framework imports
  */
-function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = false, isNodeModule = false, sourceId) {
+function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = false, isNodeModule = false, sourceId, options) {
     let result = code;
+    const resolvedSpecifierOverrides = options?.resolvedSpecifierOverrides || getProcessCodeResolvedSpecifierOverrides(sourceId, getProjectRootPath());
+    const bindingOptions = {
+        preserveNonPluginVendorImports: preserveVendorImports,
+        resolvedSpecifierOverrides,
+    };
     // Ensure Angular partial declarations are linked before any sanitizers run so runtime never hits the JIT path.
     result = linkAngularPartialsIfNeeded(result);
     // Post-linker: deduplicate/resolve imports the Angular linker injected with bare specifiers
@@ -2250,7 +1265,7 @@ function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = fa
     // __nsVendorRequire + __nsPick rewrite. Vendor imports stay as bare
     // specifiers so the device-side import map resolves them via V8's native
     // module system, which correctly handles export * re-exports.
-    result = preserveVendorImports ? ensureNativeScriptModuleBindings(result, { preserveNonPluginVendorImports: true }) : ensureNativeScriptModuleBindings(result);
+    result = ensureNativeScriptModuleBindings(result, bindingOptions);
     // Repair any accidental "import ... = expr" assignments that may have slipped in.
     try {
         result = repairImportEqualsAssignments(result);
@@ -2346,7 +1361,7 @@ function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = fa
     }
     // Ensure vendor bindings also apply after potential wrapper injections above
     // (idempotent: second pass will be a no-op if imports already consumed).
-    result = preserveVendorImports ? ensureNativeScriptModuleBindings(result, { preserveNonPluginVendorImports: true }) : ensureNativeScriptModuleBindings(result);
+    result = ensureNativeScriptModuleBindings(result, bindingOptions);
     try {
         result = repairImportEqualsAssignments(result);
     }
@@ -2387,17 +1402,17 @@ function processCodeForDevice(code, isVitePreBundled, preserveVendorImports = fa
         result = normalizeStrayCoreStringLiterals(result);
     }
     catch { }
+    try {
+        result = fixDanglingCoreFrom(result);
+    }
+    catch { }
+    try {
+        result = normalizeAnyCoreSpecToBridge(result);
+    }
+    catch { }
     result = ensureVariableDynamicImportHelper(result);
     // Normalize any lingering @nativescript/core imports to the /ns/core bridge (non-destructive best-effort)
     try {
-        result = result.replace(/from\s+["']@nativescript\/core([^"'\n]*)["']/g, (_m, sub) => {
-            const qp = (sub || '').trim().replace(/^\//, '');
-            return `from "/ns/core${qp ? `?p=${qp}` : ''}"`;
-        });
-        result = result.replace(/import\(\s*["']@nativescript\/core([^"'\n]*)["']\s*\)/g, (_m, sub) => {
-            const qp = (sub || '').trim().replace(/^\//, '');
-            return `import("/ns/core${qp ? `?p=${qp}` : ''}")`;
-        });
         // Rewrite named imports from the /ns/core bridge into default import + destructuring.
         // This makes `import { Frame } from '@nativescript/core'` work even if the bridge provides only a default export.
         {
@@ -2635,6 +1650,9 @@ function assertNoOptimizedArtifacts(code, contextLabel) {
                 if (trimmed.startsWith('//') || trimmed.startsWith('/*') || trimmed.startsWith('*')) {
                     continue;
                 }
+                if (shouldAllowLocalCoreSanitizerPaths(contextLabel)) {
+                    continue;
+                }
                 offenders.push(`${i + 1}: ${ln.substring(0, 200)} [local-core-path]`);
             }
             if (offenders.length >= 10)
@@ -2799,6 +1817,7 @@ function dedupeRtNamedImportsAgainstDestructures(code) {
 export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, projectRoot, verbose = false, outputDirOverrideRel, httpOrigin, resolveVendorAsHttp = false) {
     let result = code;
     const httpOriginSafe = httpOrigin;
+    const mixedRuntimePluginHttpRootPackages = collectMixedRuntimePluginHttpRootPackages(result, projectRoot);
     const isDynamicImportPrefix = (prefix) => /import\(\s*["']?$/.test(prefix.trimStart());
     const importerDir = path.posix.dirname(importerPath);
     // Determine importer output relative path (project-relative .mjs) to compute relative imports consistently
@@ -2969,6 +1988,25 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
             return `${prefix}${spec}${suffix}`;
         }
         const nodeModulesSpecifier = normalizeNodeModulesSpecifier(spec);
+        const normalizedRuntimePluginSpec = nodeModulesSpecifier || spec.replace(PAT.QUERY_PATTERN, '').replace(/^\/+/, '');
+        if (normalizedRuntimePluginSpec && mixedRuntimePluginHttpRootPackages.size > 0) {
+            const { packageName } = resolveNodeModulesPackageBoundary(normalizedRuntimePluginSpec, projectRoot);
+            if (packageName && mixedRuntimePluginHttpRootPackages.has(packageName)) {
+                const httpNodeModulesSpecifier = nodeModulesSpecifier || normalizedRuntimePluginSpec;
+                const httpSpec = `/ns/m/node_modules/${httpNodeModulesSpecifier}`;
+                if (httpOriginSafe) {
+                    return `${prefix}${httpOriginSafe}${httpSpec}${suffix}`;
+                }
+                return `${prefix}${httpSpec}${suffix}`;
+            }
+        }
+        if (shouldPreserveBareRuntimePluginSubpathImport(spec, projectRoot)) {
+            const httpSpec = `/ns/m/node_modules/${spec.replace(PAT.QUERY_PATTERN, '').replace(/^\/+/, '')}`;
+            if (httpOriginSafe) {
+                return `${prefix}${httpOriginSafe}${httpSpec}${suffix}`;
+            }
+            return `${prefix}${httpSpec}${suffix}`;
+        }
         const candidateNativeScriptSpec = nodeModulesSpecifier ?? spec;
         // ── Node modules routing ──────────────────────────────────────
         // Uses the package's own package.json exports field to determine
@@ -3017,7 +2055,7 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
                 return `${prefix}${out}${suffix}`;
             }
             // Case B: plain .vue module → rewrite to SFC endpoint or local artifact
-            const vueKey = resolveVueKey(spec.replace(PAT.QUERY_PATTERN, ''));
+            const vueKey = resolveVueKey(spec.replace(PAT.QUERY_PATTERN, '')) || '';
             if (vueKey) {
                 if (true) {
                     const absVue = vueKey.startsWith('/') ? vueKey : '/' + vueKey;
@@ -3047,6 +2085,17 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
         // Rewrite relative application imports to HTTP for served modules
         if (spec.startsWith('./') || spec.startsWith('../')) {
             const absMaybe = normalizeImportPath(spec, importerDir);
+            const nodeModulesHttpSpec = absMaybe ? toNodeModulesHttpModuleId(absMaybe) : null;
+            if (nodeModulesHttpSpec) {
+                if (isDynamicImportPrefix(prefix)) {
+                    if (verbose)
+                        console.log(`[rewrite][http] dynamic relative node_modules import → ${nodeModulesHttpSpec} (from ${spec})`);
+                    return `__nsDynamicHmrImport(${JSON.stringify(nodeModulesHttpSpec)})`;
+                }
+                if (verbose)
+                    console.log(`[rewrite][http] relative node_modules import → ${nodeModulesHttpSpec} (from ${spec})`);
+                return `${prefix}${nodeModulesHttpSpec}${suffix}`;
+            }
             const baseId = absMaybe ? toAppModuleBaseId(absMaybe, projectRoot) : null; // e.g. /src/foo.mjs
             if (baseId) {
                 const httpSpec = `/ns/m${baseId}`;
@@ -3201,6 +2250,13 @@ export function rewriteImports(code, importerPath, sfcFileMap, depFileMap, proje
                 console.log(`[rewrite][http] internal ns import (dynamic) → ${spec} via import.meta.url`);
             return expr;
         }
+        const nodeModulesHttpSpec = toNodeModulesHttpModuleId(spec);
+        if (nodeModulesHttpSpec) {
+            const expr = `import(new URL('${nodeModulesHttpSpec}', import.meta.url).href)`;
+            if (verbose)
+                console.log(`[rewrite][http] absolute dynamic node_modules import → ${nodeModulesHttpSpec} via import.meta.url (from ${spec})`);
+            return expr;
+        }
         const baseId = toAppModuleBaseId(spec, projectRoot);
         if (!baseId)
             return match;
@@ -3252,7 +2308,8 @@ function createHmrWebSocketPlugin(opts) {
     // Compute a dependency-closed, topologically sorted list of modules for a given set of changed ids.
     // Only include application modules we can serve (e.g., under /src and known .vue/.ts/.js entries in the graph).
     function computeTxnOrderForChanged(changedIds) {
-        const includeExt = (id) => ACTIVE_STRATEGY.matchesFile(id) || /\.(ts|js|mjs|tsx|jsx)$/i.test(id);
+        const includeAppModule = (id) => matchesRuntimeGraphModuleId(id, APP_VIRTUAL_WITH_SLASH, /\.(ts|js|mjs|tsx|jsx)$/i);
+        const includeExt = (id) => ACTIVE_STRATEGY.matchesFile(id) || includeAppModule(id);
         const isApp = (id) => id.startsWith(APP_VIRTUAL_WITH_SLASH);
         const roots = changedIds.map(normalizeGraphId).filter((id) => graph.has(id) && (isApp(id) || ACTIVE_STRATEGY.matchesFile(id)) && includeExt(id));
         const toVisit = new Set();
@@ -3391,7 +2448,7 @@ function createHmrWebSocketPlugin(opts) {
             catch { }
         });
     }
-    function upsertGraphModule(rawId, code, deps) {
+    function upsertGraphModule(rawId, code, deps, options) {
         const id = normalizeGraphId(rawId);
         const normDeps = deps
             .map((d) => normalizeGraphId(d))
@@ -3400,19 +2457,23 @@ function createHmrWebSocketPlugin(opts) {
             .sort();
         const hash = computeHash(code);
         const existing = graph.get(id);
-        if (existing && existing.hash === hash && existing.deps.length === normDeps.length && existing.deps.every((d, i) => d === normDeps[i]))
-            return; // unchanged
+        const classification = classifyGraphUpsert(existing, hash, normDeps);
+        if (classification === 'unchanged')
+            return existing;
         graphVersion++;
         const gm = { id, deps: normDeps, hash };
         graph.set(id, gm);
         if (verbose) {
             try {
-                console.log('[hmr-ws][graph] upsert', { id, deps: normDeps, hash, graphVersion });
+                console.log('[hmr-ws][graph] upsert', { id, deps: normDeps, hash, graphVersion, classification });
                 console.log('[hmr-ws][graph] size', graph.size);
             }
             catch { }
         }
-        emitDelta([gm], []);
+        if (shouldBroadcastGraphUpsertDelta(classification, options?.emitDeltaOnInsert === true, options?.broadcastDelta !== false)) {
+            emitDelta([gm], []);
+        }
+        return gm;
     }
     function isTypescriptFlavor() {
         try {
@@ -3449,15 +2510,15 @@ function createHmrWebSocketPlugin(opts) {
         }
         async function walk(dir) {
             for (const name of fs.readdirSync(dir)) {
-                const full = pathMod.join(dir, name);
-                if (name === 'node_modules' || name.startsWith('.'))
+                if (name === 'node_modules' || name.startsWith('.') || shouldSkipRuntimeGraphDirectoryName(name))
                     continue;
+                const full = pathMod.join(dir, name);
                 try {
                     const stat = fs.statSync(full);
                     if (stat.isDirectory())
                         await walk(full);
                     else if (stat.isFile()) {
-                        if (/\.(vue|ts|js|mjs|tsx|jsx)$/.test(name)) {
+                        if (shouldIncludeRuntimeGraphFile(full, /\.(vue|ts|js|mjs|tsx|jsx)$/i)) {
                             const rel = '/' + pathMod.relative(root, full).split(pathMod.sep).join('/');
                             // Transform via Vite to gather deps (ignore failures)
                             try {
@@ -3527,7 +2588,7 @@ function createHmrWebSocketPlugin(opts) {
             }, {
                 maxConcurrent: transformConcurrency,
                 resultCacheTtlMs: transformCacheMs,
-                getResultCacheKey: (url) => canonicalizeTransformRequestCacheKey(url, pluginRoot),
+                getResultCacheKey: (url) => canonicalizeTransformRequestCacheKey(url, pluginRoot || process.cwd()),
             });
             // Attempt early vendor manifest bootstrap once per server.
             if (!vendorBootstrapDone) {
@@ -3572,14 +2633,26 @@ function createHmrWebSocketPlugin(opts) {
             });
             // Additional connection diagnostics
             wss.on('connection', (ws, req) => {
+                const role = getHmrSocketRoleFromRequestUrl(req.url);
+                ws.__nsHmrClientRole = role;
                 try {
                     if (verbose) {
                         const ra = req.socket?.remoteAddress;
                         const rp = req.socket?.remotePort;
-                        console.log('[hmr-ws] Client connected', ra + (rp ? ':' + rp : ''));
+                        console.log('[hmr-ws] Client connected', { role, remote: ra + (rp ? ':' + rp : '') });
                     }
                 }
                 catch { }
+                ws.on('close', () => {
+                    try {
+                        if (verbose) {
+                            const ra = req.socket?.remoteAddress;
+                            const rp = req.socket?.remotePort;
+                            console.log('[hmr-ws] Client disconnected', { role, remote: ra + (rp ? ':' + rp : '') });
+                        }
+                    }
+                    catch { }
+                });
             });
             wss.on('error', (err) => {
                 try {
@@ -3700,18 +2773,6 @@ function createHmrWebSocketPlugin(opts) {
                         res.setHeader('Content-Type', 'application/json');
                         return void res.end(JSON.stringify({ error: e?.message || String(e) }));
                     }
-                    // Optional diagnostics: when ?diag=1, inject simple entry/exit logs to help isolate
-                    // execution-time failures on device without changing semantics.
-                    try {
-                        const wantDiag = urlObj.searchParams.get('diag') === '1';
-                        if (wantDiag) {
-                            const importerPath = spec.replace(/[?#].*$/, '');
-                            const enter = `try { console.log('[sfc][enter]', ${JSON.stringify(importerPath)}, 'hasReq=', (typeof globalThis.__nsRequire==='function'||typeof globalThis.require==='function')); } catch {}`;
-                            const exit = `\n;try { console.log('[sfc][loaded]', ${JSON.stringify(importerPath)}); } catch {}`;
-                            code = `${enter}\n${code}${exit}`;
-                        }
-                    }
-                    catch { }
                     try {
                         const origin = getServerOrigin(server);
                         code = ensureVersionedRtImports(code, origin, graphVersion);
@@ -3812,7 +2873,7 @@ function createHmrWebSocketPlugin(opts) {
                     // Support both query (?path=/abs) and path-style (/ns/m/abs)
                     let spec = urlObj.searchParams.get('path') || '';
                     // Optional graph version pin for deterministic boot
-                    const forcedVer = urlObj.searchParams.get('v');
+                    let forcedVer = urlObj.searchParams.get('v');
                     let bootTaggedRequest = false;
                     if (!spec) {
                         const base = '/ns/m';
@@ -3840,21 +2901,10 @@ function createHmrWebSocketPlugin(opts) {
                     // The iOS HTTP ESM loader canonicalizes cache keys by stripping query params,
                     // so we must carry the cache-buster in the path.
                     try {
-                        let changed = true;
-                        while (changed) {
-                            changed = false;
-                            const bootMatch = spec.match(/^\/?__ns_boot__\/[^\/]+(\/.*)?$/);
-                            if (bootMatch) {
-                                bootTaggedRequest = true;
-                                spec = bootMatch[1] || '/';
-                                changed = true;
-                            }
-                            const hmrMatch = spec.match(/^\/?__ns_hmr__\/[^\/]+(\/.*)?$/);
-                            if (hmrMatch) {
-                                spec = hmrMatch[1] || '/';
-                                changed = true;
-                            }
-                        }
+                        const decorated = stripDecoratedServePrefixes(spec);
+                        spec = decorated.cleanedSpec;
+                        bootTaggedRequest = decorated.bootTaggedRequest;
+                        forcedVer || (forcedVer = decorated.forcedVer);
                     }
                     catch { }
                     // Normalize absolute filesystem paths back to project-relative ids (e.g. /src/app.ts)
@@ -3909,6 +2959,12 @@ function createHmrWebSocketPlugin(opts) {
                         spec = APP_VIRTUAL_WITH_SLASH + spec.slice(2);
                     if (spec.startsWith('./'))
                         spec = spec.slice(1);
+                    const blockedNodeModulesReason = getBlockedDeviceNodeModulesReason(spec);
+                    if (blockedNodeModulesReason) {
+                        res.statusCode = 404;
+                        res.end(`// [ns:m] blocked device import\nthrow new Error(${JSON.stringify(`[ns/m] ${blockedNodeModulesReason}`)});\nexport {};\n`);
+                        return;
+                    }
                     if (!spec.startsWith('/'))
                         spec = '/' + spec;
                     const hasExt = /\.(ts|tsx|js|jsx|mjs|mts|cts|vue)$/i.test(spec);
@@ -4078,7 +3134,7 @@ function createHmrWebSocketPlugin(opts) {
                                     const id = (resolvedCandidate || spec).replace(/[?#].*$/, '');
                                     // Only track app modules (under APP_VIRTUAL_WITH_SLASH) and ts/js/tsx/jsx/mjs.
                                     const isApp = id.startsWith(APP_VIRTUAL_WITH_SLASH) || id.startsWith('/app/');
-                                    if (isApp && /\.(ts|tsx|js|jsx|mjs|mts|cts)$/i.test(id)) {
+                                    if (isApp && /\.(ts|tsx|js|jsx|mjs|mts|cts)$/i.test(id) && !isRuntimeGraphExcludedPath(id)) {
                                         const deps = Array.from(collectImportDependencies(code, id));
                                         if (verbose) {
                                             try {
@@ -4222,17 +3278,14 @@ export const piniaSymbol = p.piniaSymbol;
                     // persistent hot.data that survives across module re-evaluations.
                     // cleanCode() strips Vite's __vite__createHotContext assignment, which is
                     // correct — the runtime's native hot context is better.
-                    // We inject a diagnostic log to trace hot.data state during development.
-                    try {
-                        if (ACTIVE_STRATEGY?.flavor === 'solid' && /\.(tsx|jsx)$/i.test(resolvedCandidate || spec)) {
-                            const moduleId = (resolvedCandidate || spec).replace(/[?#].*$/, '');
-                            // Diagnostic: log import.meta.hot state on device to trace solid-refresh flow
-                            code = `try{if(typeof import.meta!=='undefined'&&import.meta.hot){var _hd=import.meta.hot.data;var _sr=_hd&&_hd['solid-refresh'];console.log('[solid-hmr][native-hot]',${JSON.stringify(moduleId)},'hasHot=true','hasData=',!!_hd,'hasSolidRefresh=',!!_sr,'dataKeys=',_hd?Object.keys(_hd):[]);}else{console.log('[solid-hmr][native-hot]',${JSON.stringify(moduleId)},'hasHot=',!!(typeof import.meta!=='undefined'&&import.meta.hot));}}catch(e){console.log('[solid-hmr][native-hot] error',e);}\n` + code;
-                            console.log('[hmr-ws][solid] diagnostic injected for', moduleId, '(using runtime native import.meta.hot)');
-                        }
+                    const projectRoot = server.config?.root || process.cwd();
+                    const serverOrigin = getServerOrigin(server);
+                    if (ACTIVE_STRATEGY?.flavor === 'angular') {
+                        code = prepareAngularEntryForDevice(code, resolvedCandidate || spec, sfcFileMap, depFileMap, projectRoot, !!verbose, undefined, serverOrigin, true);
+                    }
+                    else {
+                        code = rewriteImports(code, resolvedCandidate || spec, sfcFileMap, depFileMap, projectRoot, !!verbose, undefined, serverOrigin, true);
                     }
-                    catch { }
-                    code = rewriteImports(code, resolvedCandidate || spec, sfcFileMap, depFileMap, server.config?.root || process.cwd(), !!verbose, undefined, getServerOrigin(server), true);
                     // Expand `export * from "url"` into explicit named re-exports.
                     // NativeScript's HTTP ESM loader may not propagate star-re-exports across
                     // HTTP module boundaries (the namespace object gets direct exports but
@@ -4313,7 +3366,7 @@ export const piniaSymbol = p.piniaSymbol;
                     }
                     catch { }
                     try {
-                        const verNum = Number(forcedVer || graphVersion || 0);
+                        const verNum = getNumericServeVersionTag(forcedVer, Number(graphVersion || 0));
                         code = ensureVersionedRtImports(code, getServerOrigin(server), verNum);
                         code = ACTIVE_STRATEGY.ensureVersionedImports(code, getServerOrigin(server), verNum);
                         code = ensureVersionedCoreImports(code, getServerOrigin(server), verNum);
@@ -4323,20 +3376,20 @@ export const piniaSymbol = p.piniaSymbol;
                     // IMPORTANT: use path prefix (not ?v= query) because the iOS HTTP ESM loader
                     // strips query params when computing module cache keys, so ?v= doesn't bust the V8 cache.
                     try {
-                        const ver = String(forcedVer || graphVersion || 0);
-                        const origin = getServerOrigin(server);
-                        const hmrPrefix = `/ns/m/__ns_hmr__/v${ver}`;
-                        const bootHmrPrefix = `/ns/m/__ns_boot__/b1/__ns_hmr__/v${ver}`;
-                        const rewritePath = (p) => {
-                            if (!p || !p.startsWith('/ns/m/'))
-                                return p;
-                            if (p.startsWith('/ns/m/__ns_boot__/'))
-                                return p;
-                            if (p.startsWith('/ns/m/__ns_hmr__/')) {
-                                return bootTaggedRequest ? `/ns/m/__ns_boot__/b1${p.slice('/ns/m'.length)}` : p;
+                        const ver = (() => {
+                            const raw = String(forcedVer || '').trim();
+                            if (raw) {
+                                if (raw === 'live' || /^n\d+$/i.test(raw) || /^v[^/]+$/i.test(raw)) {
+                                    return raw;
+                                }
+                                if (/^\d+$/.test(raw)) {
+                                    return `v${raw}`;
+                                }
                             }
-                            return (bootTaggedRequest ? bootHmrPrefix : hmrPrefix) + p.slice('/ns/m'.length);
-                        };
+                            return `v${String(graphVersion || 0)}`;
+                        })();
+                        const origin = getServerOrigin(server);
+                        const rewritePath = (p) => rewriteNsMImportPathForHmr(p, ver, bootTaggedRequest);
                         // 1) Static imports: import ... from "/ns/m/..."
                         code = code.replace(/(from\s*["'])(\/ns\/m\/[^"'?]+)(["'])/g, (_m, a, p, b) => `${a}${rewritePath(p)}${b}`);
                         // 2) Side-effect imports: import "/ns/m/..."
@@ -4493,16 +3546,6 @@ export const piniaSymbol = p.piniaSymbol;
                         }
                         catch { }
                     }
-                    // Diagnostic: dump served code to terminal when ?__diag=1 is in the original URL
-                    try {
-                        if (urlObj?.searchParams?.get('__diag') === '1') {
-                            const specId = resolvedCandidate || spec;
-                            console.log(`\n${'='.repeat(80)}\n[ns:m][DIAG] ${specId}\n${'='.repeat(80)}`);
-                            console.log(code);
-                            console.log(`${'='.repeat(80)}\n[ns:m][DIAG] END ${specId}\n${'='.repeat(80)}\n`);
-                        }
-                    }
-                    catch { }
                     res.statusCode = 200;
                     res.end(code);
                 }
@@ -4702,39 +3745,41 @@ export const piniaSymbol = p.piniaSymbol;
             server.middlewares.use(async (req, res, next) => {
                 try {
                     const urlObj = new URL(req.url || '', 'http://localhost');
-                    // Match /ns/core, /ns/core/<ver>, and /ns/core/<subpath> (path-based deep imports)
-                    if (!urlObj.pathname.startsWith('/ns/core'))
+                    const coreRequest = parseCoreBridgeRequest(urlObj.pathname, urlObj.searchParams, Number(graphVersion || 0));
+                    if (!coreRequest)
                         return next();
                     res.setHeader('Access-Control-Allow-Origin', '*');
                     res.setHeader('Content-Type', 'application/javascript; charset=utf-8');
                     res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0');
                     res.setHeader('Pragma', 'no-cache');
                     res.setHeader('Expires', '0');
-                    const afterCore = urlObj.pathname.replace(/^\/ns\/core\/?/, '');
-                    const hasExplicitVersion = /^[0-9]+$/.test(afterCore);
-                    const ver = /^[0-9]+$/.test(afterCore) ? afterCore : String(graphVersion || 0);
-                    // Support both query-based (?p=data/observable/index.js) and
-                    // path-based (/ns/core/data/observable/index.js) subpath formats.
-                    // The device's HTTP ESM loader may use either depending on the import map.
-                    const sub = urlObj.searchParams.get('p') || (afterCore && !/^[0-9]+$/.test(afterCore) ? afterCore : '');
-                    const key = sub ? `@nativescript/core/${sub}` : `@nativescript/core`;
+                    const { hasExplicitVersion, key, normalizedSub, sub, ver } = coreRequest;
                     // Any @nativescript/core subpath import (including shallow ones like
                     // `utils`) may expose exports that are not available from the root
                     // vendor bundle namespace. Serve the actual transformed module content
                     // instead of the lightweight proxy bridge.
                     if (sub) {
                         try {
-                            const normalizedSub = sub.replace(/^\/+/, '');
+                            const resolvedSubpath = normalizedSub || sub;
+                            const projectRoot = server.config?.root || process.cwd();
+                            const resolveModuleId = async (moduleId) => {
+                                const resolved = await server.pluginContainer?.resolveId?.(moduleId, undefined);
+                                return typeof resolved === 'string' ? resolved : resolved?.id || null;
+                            };
+                            const resolvedId = await resolveRuntimeCoreModulePath(resolvedSubpath, resolveModuleId);
+                            const modulePath = resolvedId || `/node_modules/@nativescript/core/${resolvedSubpath}`;
+                            const transformed = await sharedTransformRequest(modulePath);
                             if (!hasExplicitVersion) {
+                                if (transformed?.code) {
+                                    const expandedModuleCode = await expandStarExports(transformed.code, server, projectRoot, verbose);
+                                    res.statusCode = 200;
+                                    res.end(buildVersionedCoreSubpathAliasModule(resolvedSubpath, ver, extractExportedNames(expandedModuleCode), hasModuleDefaultExport(expandedModuleCode)));
+                                    return;
+                                }
                                 res.statusCode = 200;
-                                res.end(buildVersionedCoreSubpathAliasModule(normalizedSub, ver));
+                                res.end(buildVersionedCoreSubpathAliasModule(resolvedSubpath, ver));
                                 return;
                             }
-                            const coreSpecifier = `@nativescript/core/${normalizedSub}`;
-                            const resolved = await server.pluginContainer?.resolveId?.(coreSpecifier, undefined);
-                            const resolvedId = typeof resolved === 'string' ? resolved : resolved?.id || null;
-                            const modulePath = resolvedId || `/node_modules/@nativescript/core/${normalizedSub}`;
-                            const transformed = await sharedTransformRequest(modulePath);
                             if (transformed?.code) {
                                 // Minimal pipeline: Vite already produces correct ESM.
                                 // ONLY rewrite specifier strings to device-fetchable URLs.
@@ -4755,16 +3800,37 @@ export const piniaSymbol = p.piniaSymbol;
                         }
                     }
                     // Main entry or shallow subpath: use proxy bridge
-                    // HTTP-only core bridge: do NOT use require/createRequire. Export a proxy that maps
-                    // property access to globalThis first, then to any available vendor registry module.
-                    let code = REQUIRE_GUARD_SNIPPET +
-                        `// [ns-core-bridge][v${ver}] HTTP-only ESM bridge (default proxy only)\n` +
-                        `const g = globalThis;\n` +
-                        `const reg = (g.__nsVendorRegistry ||= new Map());\n` +
-                        `const __getVendorCore = () => { try { const m = reg && reg.get ? (reg.get(${JSON.stringify(key)}) || reg.get('@nativescript/core')) : null; return (m && (m.__esModule && m.default ? m.default : (m.default || m))) || m || null; } catch { return null; } };\n` +
-                        `const __core = new Proxy({}, { get(_t, p){ if (p === 'default') return __core; if (p === Symbol.toStringTag) return 'Module'; try { const vc = __getVendorCore(); if (vc) { const vv = vc[p]; if (vv !== undefined) return vv; } } catch {} try { const v = g[p]; if (v !== undefined) return v; } catch {} return undefined; } });\n` +
-                        `// Default export: namespace-like proxy\n` +
-                        `export default __core;\n`;
+                    let code = buildVersionedCoreMainBridgeModule(key, ver);
+                    if (!sub) {
+                        try {
+                            const projectRoot = server.config?.root || process.cwd();
+                            const coreSpecifier = '@nativescript/core';
+                            const resolved = await server.pluginContainer?.resolveId?.(coreSpecifier, undefined);
+                            const resolvedId = typeof resolved === 'string' ? resolved : resolved?.id || null;
+                            const modulePath = resolvedId || '/node_modules/@nativescript/core/index.js';
+                            const staticExportNames = collectStaticExportNamesFromFile(modulePath);
+                            const staticExportOrigins = await normalizeCoreExportOriginsForRuntime(collectStaticExportOriginsFromFile(modulePath), async (moduleId) => {
+                                const nextResolved = await server.pluginContainer?.resolveId?.(moduleId, undefined);
+                                return typeof nextResolved === 'string' ? nextResolved : nextResolved?.id || null;
+                            }, modulePath);
+                            if (staticExportNames.length) {
+                                code = buildVersionedCoreMainBridgeModule(key, ver, staticExportNames, staticExportOrigins);
+                            }
+                            else {
+                                const transformed = await sharedTransformRequest(modulePath);
+                                if (transformed?.code) {
+                                    const expandedModuleCode = await expandStarExports(transformed.code, server, projectRoot, verbose);
+                                    code = buildVersionedCoreMainBridgeModule(key, ver, extractExportedNames(expandedModuleCode));
+                                }
+                            }
+                        }
+                        catch (e) {
+                            try {
+                                console.warn('[ns-core-bridge] main bridge export discovery failed:', e?.message);
+                            }
+                            catch { }
+                        }
+                    }
                     res.statusCode = 200;
                     res.end(code);
                 }
@@ -5808,7 +4874,6 @@ export const piniaSymbol = p.piniaSymbol;
                             parts.push(scriptTransformed);
                             parts.push(renderDecl);
                             parts.push(`try { if (!__ns_sfc__.render) Object.defineProperty(__ns_sfc__, 'render', { configurable: true, enumerable: true, get(){ const r = (typeof __ns_getRender==='function' ? __ns_getRender() : undefined); Object.defineProperty(__ns_sfc__, 'render', { value: r, writable: true, configurable: true, enumerable: true }); return r; }, set(v){ Object.defineProperty(__ns_sfc__, 'render', { value: v, writable: true, configurable: true, enumerable: true }); } }); } catch(_e){}`);
-                            parts.push(`// diagnostic: hadScriptDefaultPre=${hadScriptDefaultPre} triedInlineTemplate=${triedInlineTemplate} renderOk=${renderOk} tplBytes=${compiledTplCode.length} scriptBytes=${(compiledScript || '').length} templateErr=${templateErr ? templateErr?.message : ''}`);
                             parts.push(`export function render(){ const f = (typeof __ns_getRender==='function' ? __ns_getRender() : (__ns_sfc__ && __ns_sfc__.render)); return typeof f==='function' ? f.apply(this, arguments) : undefined; }`);
                             parts.push(`export default __ns_sfc__`);
                             let inlineCode = parts.filter(Boolean).join('\n');
@@ -5887,7 +4952,6 @@ export const piniaSymbol = p.piniaSymbol;
                                         outParts.push(renderDecl);
                                 }
                                 outParts.push(`try { if (!__ns_sfc__.render) Object.defineProperty(__ns_sfc__, 'render', { configurable: true, enumerable: true, get(){ const r = (typeof __ns_getRender==='function' ? __ns_getRender() : (typeof __ns_render==='function' ? __ns_render : undefined)); Object.defineProperty(__ns_sfc__, 'render', { value: r, writable: true, configurable: true, enumerable: true }); return r; }, set(v){ Object.defineProperty(__ns_sfc__, 'render', { value: v, writable: true, configurable: true, enumerable: true }); } }); } catch(_e){}`);
-                                outParts.push(`// diagnostic: hadScriptDefaultPre=${hadScriptDefaultPre} triedInlineTemplate=${triedInlineTemplate} renderOk=${renderOk} tplBytes=${compiledTplCode.length} scriptBytes=${(compiledScript || '').length} templateErr=${templateErr ? templateErr?.message : ''}`);
                                 // Export named render as a function that resolves lazily
                                 outParts.push('export function render(){ const f = (typeof __ns_getRender==="function" ? __ns_getRender() : (typeof __ns_render==="function" ? __ns_render : (__ns_sfc__ && __ns_sfc__.render))); return typeof f === "function" ? f.apply(this, arguments) : undefined; }');
                                 outParts.push('export default __ns_sfc__');
@@ -6188,12 +5252,11 @@ export const piniaSymbol = p.piniaSymbol;
                     }
                     let asm;
                     if (inlineOk) {
-                        const diagLine = `// diagnostic:inlineOk ver=${ver} inlineBlock=${!!(inlineBlock && inlineBlock.trim())} helperBindingsLen=${helperBindings.length} renderDeclLen=${renderDecl.length}`;
                         if (inlineBlock && inlineBlock.trim()) {
-                            asm = [`// [sfc-asm] ${base} (inlined template body)`, `export * from ${JSON.stringify(scriptUrl)};`, `import * as __script from ${JSON.stringify(scriptUrl)};`, inlineBlock, `const __ns_sfc__ = (__script && __script.default) ? __script.default : {};`, `try { if (typeof __ns_render === 'function' && !__ns_sfc__.render) __ns_sfc__.render = __ns_render; } catch {}`, `export default __ns_sfc__;`, diagLine].join('\n');
+                            asm = [`// [sfc-asm] ${base} (inlined template body)`, `export * from ${JSON.stringify(scriptUrl)};`, `import * as __script from ${JSON.stringify(scriptUrl)};`, inlineBlock, `const __ns_sfc__ = (__script && __script.default) ? __script.default : {};`, `try { if (typeof __ns_render === 'function' && !__ns_sfc__.render) __ns_sfc__.render = __ns_render; } catch {}`, `export default __ns_sfc__;`].join('\n');
                         }
                         else {
-                            asm = [`// [sfc-asm] ${base} (inlined template)`, `export * from ${JSON.stringify(scriptUrl)};`, `import * as __script from ${JSON.stringify(scriptUrl)};`, helperBindings, renderDecl, `const __ns_sfc__ = (__script && __script.default) ? __script.default : {};`, `try { if (typeof __ns_render === 'function' && !__ns_sfc__.render) __ns_sfc__.render = __ns_render; } catch {}`, `export default __ns_sfc__;`, diagLine].filter(Boolean).join('\n');
+                            asm = [`// [sfc-asm] ${base} (inlined template)`, `export * from ${JSON.stringify(scriptUrl)};`, `import * as __script from ${JSON.stringify(scriptUrl)};`, helperBindings, renderDecl, `const __ns_sfc__ = (__script && __script.default) ? __script.default : {};`, `try { if (typeof __ns_render === 'function' && !__ns_sfc__.render) __ns_sfc__.render = __ns_render; } catch {}`, `export default __ns_sfc__;`].filter(Boolean).join('\n');
                         }
                     }
                     else {
@@ -6465,8 +5528,8 @@ export const piniaSymbol = p.piniaSymbol;
                                                 ts: Date.now(),
                                                 delta: true,
                                             };
-                                            wss.clients.forEach((c) => {
-                                                if (c.readyState === c.OPEN) {
+                                            wss?.clients.forEach((c) => {
+                                                if (isSocketClientOpen(c)) {
                                                     try {
                                                         c.send(JSON.stringify(single));
                                                     }
@@ -6554,6 +5617,9 @@ export const piniaSymbol = p.piniaSymbol;
             if (!wss) {
                 return;
             }
+            if (isRuntimeGraphExcludedPath(file)) {
+                return;
+            }
             // Graph update for this file change (wrapped to avoid aborting rest of handler)
             try {
                 const skipAngularHtmlGraphUpdate = ACTIVE_STRATEGY.flavor === 'angular' && /\.(html|htm)$/i.test(file);
@@ -6573,7 +5639,10 @@ export const piniaSymbol = p.piniaSymbol;
                                 .filter(Boolean);
                             const transformed = await server.transformRequest(mod.id);
                             const code = transformed?.code || '';
-                            upsertGraphModule((mod.id || '').replace(/\?.*$/, ''), code, deps);
+                            upsertGraphModule((mod.id || '').replace(/\?.*$/, ''), code, deps, {
+                                emitDeltaOnInsert: true,
+                                broadcastDelta: ACTIVE_STRATEGY.flavor !== 'angular',
+                            });
                         }
                         catch (error) {
                             if (verbose)
@@ -6616,7 +5685,7 @@ export const piniaSymbol = p.piniaSymbol;
                         ],
                     };
                     wss.clients.forEach((client) => {
-                        if (client.readyState === client.OPEN) {
+                        if (isSocketClientOpen(client)) {
                             client.send(JSON.stringify(msg));
                         }
                     });
@@ -6682,27 +5751,20 @@ export const piniaSymbol = p.piniaSymbol;
                     }
                 }
                 try {
-                    const transformCacheInvalidationUrls = new Set();
-                    if (isTs) {
-                        transformCacheInvalidationUrls.add(file);
-                    }
-                    for (const mod of angularHotUpdateRoots) {
-                        if (mod?.id) {
-                            transformCacheInvalidationUrls.add(mod.id);
-                        }
-                    }
-                    if (shouldInvalidateAngularTransitiveImporters({ flavor: ACTIVE_STRATEGY.flavor, file })) {
-                        const transitiveImporters = collectAngularTransitiveImportersForInvalidation({
+                    const transitiveImporters = shouldInvalidateAngularTransitiveImporters({ flavor: ACTIVE_STRATEGY.flavor, file })
+                        ? collectAngularTransitiveImportersForInvalidation({
                             modules: angularTransitiveInvalidationRoots,
                             isExcluded: (id) => id.includes('/node_modules/'),
                             maxDepth: 16,
-                        });
-                        for (const mod of transitiveImporters) {
-                            if (mod?.id) {
-                                transformCacheInvalidationUrls.add(mod.id);
-                            }
-                        }
-                    }
+                        })
+                        : [];
+                    const transformCacheInvalidationUrls = new Set(collectAngularTransformCacheInvalidationUrls({
+                        file,
+                        isTs,
+                        hotUpdateRoots: angularHotUpdateRoots,
+                        transitiveImporters,
+                        projectRoot: server.config.root || process.cwd(),
+                    }));
                     if (transformCacheInvalidationUrls.size) {
                         sharedTransformRequest.invalidateMany(transformCacheInvalidationUrls);
                         if (verbose) {
@@ -6723,10 +5785,18 @@ export const piniaSymbol = p.piniaSymbol;
                         type: 'ns:angular-update',
                         origin,
                         path: rel,
+                        version: graphVersion,
                         timestamp: Date.now(),
                     };
+                    if (verbose) {
+                        console.log('[hmr-ws][angular] broadcasting update', Array.from(wss.clients || []).map((client) => ({
+                            role: getHmrSocketRole(client),
+                            readyState: client.readyState,
+                            openState: client.OPEN,
+                        })));
+                    }
                     wss.clients.forEach((client) => {
-                        if (client.readyState === client.OPEN) {
+                        if (isSocketClientOpen(client)) {
                             client.send(JSON.stringify(msg));
                         }
                     });
@@ -6748,10 +5818,7 @@ export const piniaSymbol = p.piniaSymbol;
                     // Treat the changed file itself as a graph module with no deps. We only
                     // care that its hash/identity changes so the client sees a delta and can
                     // perform a TS root reset. Code is not used for execution here.
-                    upsertGraphModule(rel, '', []);
-                    const gm = graph.get(normalizeGraphId(rel));
-                    if (gm)
-                        emitDelta([gm], []);
+                    upsertGraphModule(rel, '', [], { emitDeltaOnInsert: true });
                 }
                 catch (e) {
                     if (verbose)
@@ -6782,7 +5849,7 @@ export const piniaSymbol = p.piniaSymbol;
                     if (!existing) {
                         // Module not in graph yet — force upsert with timestamp-based
                         // hash so the client sees a change.
-                        upsertGraphModule(rel, `/* solid-hmr ${Date.now()} */`, []);
+                        upsertGraphModule(rel, `/* solid-hmr ${Date.now()} */`, [], { emitDeltaOnInsert: true });
                     }
                     // Log what we're sending so devs can trace the flow on the server side.
                     if (verbose) {
@@ -6979,7 +6046,7 @@ if (typeof __VUE_HMR_RUNTIME__ === 'undefined') {
                     version: graphVersion,
                 };
                 wss.clients.forEach((client) => {
-                    if (client.readyState === client.OPEN) {
+                    if (isSocketClientOpen(client)) {
                         client.send(JSON.stringify(registryUpdateMsg));
                     }
                 });
@@ -7150,4 +6217,6 @@ function getServerOrigin(server) {
 // Test-only export: allow unit tests to run the sanitizer on snippets without booting a server
 // Safe in production builds; this is a named export that tests can import explicitly.
 export const __test_processCodeForDevice = processCodeForDevice;
+export const __test_resolveVendorRouting = resolveVendorRouting;
+export const __test_getBlockedDeviceNodeModulesReason = getBlockedDeviceNodeModulesReason;
 //# sourceMappingURL=websocket.js.map