veryfront 0.1.94 → 0.1.96

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/distributed-cache.js

@@ -18,6 +18,9 @@ import { getDistributedTransformBackend } from "../../../esm/transform-cache.js"
 import { TRANSFORM_DISTRIBUTED_TTL_SEC } from "../../../../utils/constants/cache.js";
 import { hasUnresolvedImports } from "./nested-imports.js";
 import { findMissingFileDependenciesInCode, hasIncompatibleFrameworkPaths, } from "./framework-validator.js";
+import { ensureMdxModuleDependencies } from "./dependency-recovery.js";
+import { buildMdxEsmModuleFileName, buildMdxEsmModuleRecoveryCacheKey } from "../cache-format.js";
+import { hashString } from "../utils/hash.js";
 /** TTL for cached transforms (uses centralized config) */
 const TRANSFORM_CACHE_TTL_SECONDS = TRANSFORM_DISTRIBUTED_TTL_SEC;
 /**
@@ -34,7 +37,7 @@ const TRANSFORM_CACHE_TTL_SECONDS = TRANSFORM_DISTRIBUTED_TTL_SEC;
  * Returns null only if no distributed cache backend is available.
  * Otherwise returns `{ code, distributedCache }` where `code` may be null (cache miss).
  */
-export async function readDistributedCache(transformCacheKey, normalizedPath, projectSlug, projectDir, reactVersion, log) {
+export async function readDistributedCache(transformCacheKey, projectId, contentSourceId, normalizedPath, projectSlug, projectDir, reactVersion, log) {
     const distributedCache = await getDistributedTransformBackend();
     if (!distributedCache)
         return null;
@@ -87,8 +90,23 @@ export async function readDistributedCache(transformCacheKey, normalizedPath, pr
         // that don't exist on this machine.
         if (moduleCode) {
             const missingDeps = await findMissingFileDependenciesInCode(moduleCode, log);
-            if (missingDeps.length > 0) {
-                log.warn(`${LOG_PREFIX_MDX_LOADER} Cached code has ${missingDeps.length} missing file dependencies, invalidating`, { normalizedPath, missingDeps: missingDeps.slice(0, 5) });
+            if (missingDeps.length > 0 && contentSourceId) {
+                const recovered = await ensureMdxModuleDependencies(moduleCode, {
+                    distributedCache,
+                    projectId,
+                    contentSourceId,
+                    log,
+                });
+                if (recovered.recovered.length > 0) {
+                    log.debug(`${LOG_PREFIX_MDX_LOADER} Recovered missing vfmod dependencies from cache`, {
+                        normalizedPath,
+                        recovered: recovered.recovered.slice(0, 5),
+                    });
+                }
+            }
+            const unresolvedDeps = await findMissingFileDependenciesInCode(moduleCode, log);
+            if (unresolvedDeps.length > 0) {
+                log.warn(`${LOG_PREFIX_MDX_LOADER} Cached code has ${unresolvedDeps.length} missing file dependencies, invalidating`, { normalizedPath, missingDeps: unresolvedDeps.slice(0, 5) });
                 moduleCode = null;
             }
         }
@@ -127,7 +145,7 @@ export async function readDistributedCache(transformCacheKey, normalizedPath, pr
  *
  * This is fire-and-forget: errors are logged but do not propagate.
  */
-export function writeDistributedCache(distributedCache, transformCacheKey, moduleCode, normalizedPath, log) {
+export function writeDistributedCache(distributedCache, transformCacheKey, projectId, contentSourceId, moduleCode, normalizedPath, log) {
     // Tokenize all cache paths for cross-environment portability
     // Uses aggressive tokenization to catch paths from ANY environment (build server, other pods)
     const portableCode = tokenizeAllVeryFrontPaths(moduleCode);
@@ -140,6 +158,17 @@ export function writeDistributedCache(distributedCache, transformCacheKey, modul
             error,
         });
     });
+    const moduleFileName = buildMdxEsmModuleFileName(hashString(normalizedPath + moduleCode));
+    const moduleRecoveryKey = buildMdxEsmModuleRecoveryCacheKey(projectId, contentSourceId, moduleFileName);
+    distributedCache
+        .set(moduleRecoveryKey, portableCode, TRANSFORM_CACHE_TTL_SECONDS)
+        .catch((error) => {
+        log.debug(`${LOG_PREFIX_MDX_LOADER} Distributed vfmod recovery set failed`, {
+            normalizedPath,
+            moduleRecoveryKey,
+            error,
+        });
+    });
     // Create and store bundle manifest companion key for atomic validation
     const bundlePaths = extractHttpBundlePaths(moduleCode);
     if (bundlePaths.length > 0) {

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/framework-validator.d.ts

@@ -7,6 +7,10 @@
  * @module transforms/mdx/esm-module-loader/module-fetcher/framework-validator
  */
 import type { Logger } from "../../../../utils/logger/logger.js";
+interface MdxRecoveryOptions {
+    projectId: string;
+    contentSourceId: string;
+}
 /**
  * Check if cached code has file:// paths that are incompatible with this environment.
  * Returns true if the cached code should be invalidated (has paths from a different environment).
@@ -29,5 +33,6 @@ export declare function hasIncompatibleFrameworkPaths(code: string, log: Logger)
  * to vfmod modules that were created on a different pod/run with different hashes.
  */
 export declare function findMissingFileDependenciesInCode(code: string, log: Logger): Promise<string[]>;
-export declare function validateCachedModule(normalizedPath: string, cachedPath: string, cachedCode: string, log: Logger, pathCache: Map<string, string>, versionedKey: string): Promise<boolean>;
+export declare function validateCachedModule(normalizedPath: string, cachedPath: string, cachedCode: string, log: Logger, pathCache: Map<string, string>, versionedKey: string, recoveryOptions?: MdxRecoveryOptions): Promise<boolean>;
+export {};
 //# sourceMappingURL=framework-validator.d.ts.map

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/framework-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"framework-validator.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/framework-validator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAQjE;;;;;;;;;;;;GAYG;AACH,wBAAsB,6BAA6B,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAqE/F;AAED;;;;;;GAMG;AACH,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,EAAE,CAAC,CA6BnB;AAYD,wBAAsB,oBAAoB,CACxC,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC,CAkDlB"}
+{"version":3,"file":"framework-validator.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/framework-validator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AASjE,UAAU,kBAAkB;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,6BAA6B,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAqE/F;AAED;;;;;;GAMG;AACH,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,EAAE,CAAC,CA6BnB;AAYD,wBAAsB,oBAAoB,CACxC,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,YAAY,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,kBAAkB,GACnC,OAAO,CAAC,OAAO,CAAC,CAgFlB"}

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/framework-validator.js

@@ -12,6 +12,7 @@ import { getLocalFs } from "../cache/index.js";
 import { extractHttpBundlePaths } from "../../../../modules/react-loader/ssr-module-loader/http-bundle-helpers.js";
 import { ensureHttpBundlesExist } from "../../../esm/http-cache.js";
 import { MDX_ESM_MJS_FILE_URL_PATTERN_SOURCE } from "../cache-format.js";
+import { ensureMdxModuleDependencies } from "./dependency-recovery.js";
 /**
  * Check if cached code has file:// paths that are incompatible with this environment.
  * Returns true if the cached code should be invalidated (has paths from a different environment).
@@ -133,7 +134,7 @@ function hasRawHttpImports(code) {
     const httpImportPattern = /from\s+["'](https?:\/\/[^"']+)["']/gi;
     return httpImportPattern.test(code);
 }
-export async function validateCachedModule(normalizedPath, cachedPath, cachedCode, log, pathCache, versionedKey) {
+export async function validateCachedModule(normalizedPath, cachedPath, cachedCode, log, pathCache, versionedKey, recoveryOptions) {
     // Reject caches with raw HTTP URLs - all modules should use file:// paths.
     // This ensures consistency between compiled and non-compiled modes.
     if (hasRawHttpImports(cachedCode)) {
@@ -164,6 +165,35 @@ export async function validateCachedModule(normalizedPath, cachedPath, cachedCod
             return false;
         }
     }
+    if (recoveryOptions) {
+        const recovered = await ensureMdxModuleDependencies(cachedCode, {
+            ...recoveryOptions,
+            log,
+        });
+        if (recovered.recovered.length > 0) {
+            log.debug(`${LOG_PREFIX_MDX_LOADER} Recovered cached module vfmod dependencies`, {
+                normalizedPath,
+                cachedPath,
+                recovered: recovered.recovered.slice(0, 5),
+            });
+        }
+    }
+    const missingDeps = await findMissingFileDependenciesInCode(cachedCode, log);
+    if (missingDeps.length > 0) {
+        log.warn(`${LOG_PREFIX_MDX_LOADER} Cached module has missing vfmod dependencies`, {
+            normalizedPath,
+            cachedPath,
+            missingDeps: missingDeps.slice(0, 5),
+        });
+        pathCache.delete(versionedKey);
+        try {
+            await getLocalFs().remove(cachedPath);
+        }
+        catch (_) {
+            /* expected: cached file may already be removed */
+        }
+        return false;
+    }
     if (!(await hasIncompatibleFrameworkPaths(cachedCode, log)))
         return true;
     log.warn(`${LOG_PREFIX_MDX_LOADER} Cached module has incompatible framework paths`, {

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/index.d.ts

@@ -37,6 +37,7 @@ export declare function fetchAndCacheModule(modulePath: string, context: ModuleF
  * Create a module fetcher context.
  */
 export declare function createModuleFetcherContext(esmCacheDir: string, adapter: RuntimeAdapter, projectDir: string, projectId: string, options?: {
+    contentSourceId?: string;
     isLocalProject?: boolean;
     projectSlug?: string;
     reactVersion?: string;

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAM5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAexD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAS5E;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAOtD;AAED;;GAEG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;gBAC1C,SAAS,EAAE,MAAM;CAI9B;AAcD;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,oBAAoB,EAC7B,gBAAgB,CAAC,EAAE,MAAM,EACzB,OAAO,GAAE,GAAG,CAAC,MAAM,CAAa,GAC/B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwFxB;AAuQD;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;IACR,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,GACA,oBAAoB,CAUtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/src/transforms/mdx/esm-module-loader/module-fetcher/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAM5E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAexD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAS5E;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,KAAK;gBACtC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAOtD;AAED;;GAEG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;gBAC1C,SAAS,EAAE,MAAM;CAI9B;AAcD;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,oBAAoB,EAC7B,gBAAgB,CAAC,EAAE,MAAM,EACzB,OAAO,GAAE,GAAG,CAAC,MAAM,CAAa,GAC/B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwFxB;AAqRD;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;IACR,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,GACA,oBAAoB,CAUtB"}

package/esm/src/transforms/mdx/esm-module-loader/module-fetcher/index.js

@@ -148,7 +148,7 @@ export async function fetchAndCacheModule(modulePath, context, parentModulePath,
  */
 async function doFetchAndCacheModule(normalizedPath, context, fetchAndCacheModuleFn, projectSlug, parentModulePath) {
     const log = getLog(context);
-    const { esmCacheDir, adapter, projectDir, projectId } = context;
+    const { esmCacheDir, adapter, projectDir, projectId, contentSourceId } = context;
     const pathCache = await getModulePathCache(esmCacheDir);
     const versionedKey = getVersionedPathCacheKey(normalizedPath);
     const cachedPath = pathCache.get(versionedKey);
@@ -157,7 +157,12 @@ async function doFetchAndCacheModule(normalizedPath, context, fetchAndCacheModul
             const stat = await getLocalFs().stat(cachedPath);
             if (stat?.isFile) {
                 const cachedCode = await getLocalFs().readTextFile(cachedPath);
-                if (await validateCachedModule(normalizedPath, cachedPath, cachedCode, log, pathCache, versionedKey)) {
+                if (await validateCachedModule(normalizedPath, cachedPath, cachedCode, log, pathCache, versionedKey, context.contentSourceId
+                    ? {
+                        projectId: context.projectId,
+                        contentSourceId: context.contentSourceId,
+                    }
+                    : undefined)) {
                     recordModuleToSession(normalizedPath);
                     return cachedPath;
                 }
@@ -186,13 +191,17 @@ async function doFetchAndCacheModule(normalizedPath, context, fetchAndCacheModul
         }
         const { sourceCode, actualFilePath } = resolved;
         const contentHash = hashString(sourceCode);
-        const transformCacheKey = getTransformCacheKey(projectId, normalizedPath, contentHash);
+        const transformCacheKey = contentSourceId
+            ? getTransformCacheKey(projectId, contentSourceId, normalizedPath, contentHash)
+            : null;
         let moduleCode = null;
         let needsDistributedCacheWrite = false;
         // Try distributed cache read with full validation.
         // Returns null only if no distributed backend is configured.
         // Otherwise returns { code, distributedCache } where code may be null (miss).
-        const distResult = await readDistributedCache(transformCacheKey, normalizedPath, projectSlug, projectDir, context.reactVersion, log);
+        const distResult = transformCacheKey
+            ? await readDistributedCache(transformCacheKey, projectId, contentSourceId, normalizedPath, projectSlug, projectDir, context.reactVersion, log)
+            : null;
         if (distResult?.code) {
             moduleCode = distResult.code;
         }
@@ -299,8 +308,8 @@ async function doFetchAndCacheModule(normalizedPath, context, fetchAndCacheModul
         moduleCode = await processNestedImports(moduleCode, relativeResults, esmCacheDir, context.strictMissingModules ?? true, normalizedPath, projectSlug);
         // Write to distributed cache AFTER nested imports are resolved.
         // This ensures other pods get fully-resolved code without /_vf_modules/ paths.
-        if (needsDistributedCacheWrite && distResult?.distributedCache) {
-            writeDistributedCache(distResult.distributedCache, transformCacheKey, moduleCode, normalizedPath, log);
+        if (needsDistributedCacheWrite && distResult?.distributedCache && transformCacheKey) {
+            writeDistributedCache(distResult.distributedCache, transformCacheKey, projectId, contentSourceId, moduleCode, normalizedPath, log);
         }
         log.debug(`${LOG_PREFIX_MDX_LOADER} [fetchAndCacheModule] cacheModule START`, {
             projectSlug,

package/esm/src/transforms/mdx/esm-module-loader/types.d.ts

@@ -40,6 +40,7 @@ export interface ModuleFetcherContext {
     adapter: RuntimeAdapter;
     projectDir: string;
     projectId: string;
+    contentSourceId?: string;
     projectSlug?: string;
     isLocalProject?: boolean;
     /**

package/esm/src/transforms/mdx/esm-module-loader/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACzC,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC;IACrD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IACzD,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9C;AAaD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IACtD,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qFAAqF;IACrF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/src/transforms/mdx/esm-module-loader/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACzC,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC;IACrD,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IACzD,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC9C;AAaD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,cAAc,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IACtD,yDAAyD;IACzD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qFAAqF;IACrF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B"}

package/esm/src/utils/version.d.ts

@@ -1,4 +1,4 @@
-export declare const VERSION = "0.1.94";
+export declare const VERSION = "0.1.96";
 export declare function normalizeVeryfrontVersion(version: string | undefined): string | undefined;
 export declare function resolveRuntimeVersion(options?: {
     veryfrontVersion?: string;

package/esm/src/utils/version.js

@@ -2,7 +2,7 @@ import denoConfig from "../../deno.js";
 import { getEnv } from "../platform/compat/process.js";
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
-export const VERSION = "0.1.94";
+export const VERSION = "0.1.96";
 export function normalizeVeryfrontVersion(version) {
     if (!version)
         return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.94",
+  "version": "0.1.96",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",

package/src/deno.js

@@ -1,6 +1,6 @@
 export default {
   "name": "veryfront",
-  "version": "0.1.94",
+  "version": "0.1.96",
   "license": "Apache-2.0",
   "nodeModulesDir": "auto",
   "exclude": [

package/src/src/modules/react-loader/ssr-module-loader/loader.ts

@@ -54,6 +54,7 @@ import { preflightLocalImports } from "./preflight-imports.js";
 import { resolveVfModuleImports } from "./vf-module-resolver.js";
 import { registerCSSImport } from "../css-import-collector.js";
 import { injectNodePositions } from "../../../transforms/plugins/babel-node-positions.js";
+import { ensureMdxModuleDependencies } from "../../../transforms/mdx/esm-module-loader/module-fetcher/dependency-recovery.js";
 
 const logger = rendererLogger.component("ssr-module-loader");
 
@@ -230,6 +231,35 @@ export class SSRModuleLoader {
       }
 
       if (classifiedError.type === "module-not-found") {
+        if (this.options.contentSourceId) {
+          try {
+            const cachedCode = await this.cache.getFs().readTextFile(cacheEntry.tempPath);
+            const recovered = await ensureMdxModuleDependencies(cachedCode, {
+              projectId: this.options.projectId,
+              contentSourceId: this.options.contentSourceId,
+              log: logger,
+            });
+            if (recovered.missing.length === 0 && recovered.recovered.length > 0) {
+              const retryTempPath = cacheEntry.tempPath.replace(/\.mjs$/, "") +
+                `-recovered-${cacheEntry.contentHash}.mjs`;
+              await this.cache.getFs().writeTextFile(retryTempPath, cachedCode);
+              logger.info("Recovered vfmod dependencies for cached SSR module, retrying import", {
+                file: filePath.slice(-40),
+                recovered: recovered.recovered.slice(0, 5),
+                retryTempPath,
+              });
+              return (await import(
+                `file://${retryTempPath}?v=${cacheEntry.contentHash}&retry=1`
+              )) as Record<string, unknown>;
+            }
+          } catch (recoveryError) {
+            logger.debug("Failed to recover vfmod dependencies for cached SSR module", {
+              file: filePath.slice(-40),
+              error: recoveryError instanceof Error ? recoveryError.message : String(recoveryError),
+            });
+          }
+        }
+
         logger.error(
           "[SSR-MODULE-LOADER] Cached module has missing dependency, invalidating cache",
           {
@@ -426,6 +456,10 @@ export class SSRModuleLoader {
         mdxCacheDir,
         this.options.projectDir,
         contentHash,
+        {
+          projectId: this.options.projectId,
+          contentSourceId: this.options.contentSourceId,
+        },
       );
 
       if (mdxCacheResult.status === "hit") {

package/src/src/modules/react-loader/ssr-module-loader/ssr-cache-manager.ts

@@ -26,6 +26,7 @@ import {
 } from "./http-bundle-helpers.js";
 import { buildTempModulePath, buildTmpDirPath, getTmpDirCacheKey } from "./tmp-paths.js";
 import type { ModuleCacheEntry, SSRModuleLoaderOptions } from "./types.js";
+import { ensureMdxModuleDependencies } from "../../../transforms/mdx/esm-module-loader/module-fetcher/dependency-recovery.js";
 
 const logger = rendererLogger.component("ssr-module-loader");
 
@@ -169,7 +170,7 @@ export class SSRCacheManager {
     try {
       const cachedCode = await this.fs.readTextFile(cachedEntry.tempPath);
       const isValid = await this.validateCachedCode(cachedCode, filePath, "memory-cache", {
-        checkLocalPaths: false,
+        checkLocalPaths: true,
         checkInvalidEsmShPath: false,
       });
       if (!isValid) {
@@ -237,11 +238,14 @@ export class SSRCacheManager {
 
   private async hasMissingLocalPaths(code: string, filePath: string): Promise<boolean> {
     const allPaths = extractAllFilePaths(code);
+    let hasMissingPath = false;
+
     for (const path of allPaths) {
       try {
         const stat = await this.fs.stat(path);
         if (!stat.isFile) {
-          return true;
+          hasMissingPath = true;
+          break;
         }
       } catch (error) {
         logger.debug("Redis cache has invalid local path, re-transforming", {
@@ -249,6 +253,34 @@ export class SSRCacheManager {
           missingPath: path.slice(-60),
           error,
         });
+        hasMissingPath = true;
+        break;
+      }
+    }
+
+    if (
+      hasMissingPath &&
+      this.options.projectId &&
+      this.options.contentSourceId
+    ) {
+      const recovered = await ensureMdxModuleDependencies(code, {
+        projectId: this.options.projectId,
+        contentSourceId: this.options.contentSourceId,
+        log: logger,
+      });
+      if (recovered.recovered.length > 0) {
+        logger.debug("Recovered missing local vfmod dependencies for SSR cache entry", {
+          file: filePath.slice(-40),
+          recovered: recovered.recovered.slice(0, 5),
+        });
+      }
+    }
+
+    for (const path of allPaths) {
+      try {
+        const stat = await this.fs.stat(path);
+        if (!stat.isFile) return true;
+      } catch (_) {
         return true;
       }
     }

package/src/src/modules/react-loader/ssr-module-loader/vf-module-resolver.ts

@@ -78,6 +78,7 @@ export async function resolveVfModuleImports(
     options.projectDir,
     options.projectId,
     {
+      contentSourceId: options.contentSourceId,
       reactVersion: options.reactVersion,
       projectSlug: options.projectId,
       strictMissingModules: false,

package/src/src/rendering/orchestrator/module-loader/index.ts

@@ -223,7 +223,18 @@ export async function transformModuleWithDeps(
     const sourceKey = encodeURIComponent(contentSourceId);
     const mdxCacheDir = join(baseCacheDir, projectKey, sourceKey);
 
-    const mdxCacheResult = await lookupMdxEsmCache(filePath, mdxCacheDir, projectDir);
+    const mdxCacheResult = await lookupMdxEsmCache(
+      filePath,
+      mdxCacheDir,
+      projectDir,
+      undefined,
+      contentSourceId
+        ? {
+          projectId,
+          contentSourceId,
+        }
+        : undefined,
+    );
     if (mdxCacheResult.status === "hit") {
       moduleCache.set(cacheKey, mdxCacheResult.path);
       return mdxCacheResult.path;

package/src/src/server/handlers/dev/scripts/hmr-scripts.ts

@@ -99,6 +99,7 @@ function getUpdateJSFunction(logPrefix: string): string {
           return;
         }
 
+        pending.removeAttribute('data-vf-tailwind-pending');
         pending.id = 'vf-tailwind-css';
         current.remove();
         resolve(true);

package/src/src/transforms/mdx/esm-module-loader/cache/index.ts

@@ -21,6 +21,7 @@ import {
 import { LOG_PREFIX_MDX_LOADER } from "../constants.js";
 import { LRUCache } from "../../../../utils/lru-wrapper.js";
 import { buildMdxEsmPathCacheKey, MDX_ESM_ALL_FILE_URL_PATTERN_SOURCE } from "../cache-format.js";
+import { ensureMdxModuleDependencies } from "../module-fetcher/dependency-recovery.js";
 
 export type CacheLookupResult =
   | { status: "hit"; path: string }
@@ -341,6 +342,7 @@ export async function lookupMdxEsmCache(
   cacheDir: string,
   projectDir?: string,
   _contentHash?: string, // Intentionally unused - kept for API compatibility
+  recoveryOptions?: { projectId: string; contentSourceId: string },
 ): Promise<CacheLookupResult> {
   const cache = await getModulePathCache(cacheDir);
   const cacheKey = toMdxEsmCacheKey(filePath, projectDir);
@@ -408,7 +410,22 @@ export async function lookupMdxEsmCache(
     // CRITICAL: Check that all file:// dependencies actually exist on disk.
     // The distributed cache may contain code referencing file:// paths from other pods
     // that don't exist locally (e.g., HTTP bundles, MDX-ESM modules).
-    const missingDeps = await findMissingFileDependencies(cachedCode);
+    let missingDeps = await findMissingFileDependencies(cachedCode);
+    if (missingDeps.length > 0 && recoveryOptions) {
+      const recovered = await ensureMdxModuleDependencies(cachedCode, {
+        ...recoveryOptions,
+        log: logger,
+      });
+      if (recovered.recovered.length > 0) {
+        logger.debug(`${LOG_PREFIX_MDX_LOADER} Recovered cached MDX-ESM dependencies`, {
+          filePath,
+          cachedPath,
+          recovered: recovered.recovered.slice(0, 5),
+        });
+      }
+      missingDeps = await findMissingFileDependencies(cachedCode);
+    }
+
     if (missingDeps.length > 0) {
       logger.warn(
         `${LOG_PREFIX_MDX_LOADER} Cached module has ${missingDeps.length} missing file dependencies, invalidating`,

package/src/src/transforms/mdx/esm-module-loader/cache-format.ts

@@ -10,10 +10,11 @@ const CACHE_NAMESPACE_SENTINEL = "__vf_cache_namespace__";
 function formatMdxEsmTransformCacheKey(
   namespace: string,
   projectId: string,
+  contentSourceId: string,
   normalizedPath: string,
   contentHash: string,
 ): string {
-  return `${namespace}:${projectId}:${normalizedPath}:${contentHash}:ssr`;
+  return `${namespace}:${projectId}:${contentSourceId}:${normalizedPath}:${contentHash}:ssr`;
 }
 
 function formatMdxEsmPathCacheKey(namespace: string, normalizedPath: string): string {
@@ -24,6 +25,15 @@ function formatMdxEsmModuleFileName(namespace: string, contentHash: string): str
   return `vfmod-${namespace}-${contentHash}.mjs`;
 }
 
+function formatMdxEsmModuleRecoveryCacheKey(
+  namespace: string,
+  projectId: string,
+  contentSourceId: string,
+  fileName: string,
+): string {
+  return `${namespace}:${projectId}:${contentSourceId}:${fileName}:vfmod`;
+}
+
 function formatMdxJsxCacheFileName(namespace: string, filePath: string): string {
   return `jsx-${namespace}-${hashString(filePath)}.mjs`;
 }
@@ -42,11 +52,18 @@ function buildMdxEsmCacheSchemaSample() {
     transformKey: formatMdxEsmTransformCacheKey(
       CACHE_NAMESPACE_SENTINEL,
       "__vf_project__",
+      "preview-main",
       "_vf_modules/pages/index.js",
       "deadbeef",
     ),
     pathKey: formatMdxEsmPathCacheKey(CACHE_NAMESPACE_SENTINEL, "_vf_modules/pages/index.js"),
     moduleFile: formatMdxEsmModuleFileName(CACHE_NAMESPACE_SENTINEL, "deadbeef"),
+    moduleRecoveryKey: formatMdxEsmModuleRecoveryCacheKey(
+      CACHE_NAMESPACE_SENTINEL,
+      "__vf_project__",
+      "preview-main",
+      formatMdxEsmModuleFileName(CACHE_NAMESPACE_SENTINEL, "deadbeef"),
+    ),
     jsxFile: formatMdxJsxCacheFileName(CACHE_NAMESPACE_SENTINEL, "/tmp/project/Button.tsx"),
     unresolvedVfModulesPattern: UNRESOLVED_VF_MODULES_PATTERN.source,
     allFileUrlPattern: ALL_FILE_URL_PATTERN_SOURCE,
@@ -84,12 +101,14 @@ export const FRAMEWORK_VF_MODULE_CACHE_NAMESPACE = createCacheNamespace(
 
 export function buildMdxEsmTransformCacheKey(
   projectId: string,
+  contentSourceId: string,
   normalizedPath: string,
   contentHash: string,
 ): string {
   return formatMdxEsmTransformCacheKey(
     MDX_ESM_CACHE_NAMESPACE,
     projectId,
+    contentSourceId,
     normalizedPath,
     contentHash,
   );
@@ -103,6 +122,19 @@ export function buildMdxEsmModuleFileName(contentHash: string): string {
   return formatMdxEsmModuleFileName(MDX_ESM_CACHE_NAMESPACE, contentHash);
 }
 
+export function buildMdxEsmModuleRecoveryCacheKey(
+  projectId: string,
+  contentSourceId: string,
+  fileName: string,
+): string {
+  return formatMdxEsmModuleRecoveryCacheKey(
+    MDX_ESM_CACHE_NAMESPACE,
+    projectId,
+    contentSourceId,
+    fileName,
+  );
+}
+
 export function buildMdxJsxCacheFileName(filePath: string): string {
   return formatMdxJsxCacheFileName(MDX_ESM_CACHE_NAMESPACE, filePath);
 }

package/src/src/transforms/mdx/esm-module-loader/loader-helpers.ts

@@ -151,6 +151,7 @@ export async function processVfModuleImports(
     projectDir,
     context.projectId,
     {
+      contentSourceId: context.contentSourceId,
       reactVersion: context.reactVersion,
       projectSlug: context.projectSlug,
       logger: logger.child({

package/src/src/transforms/mdx/esm-module-loader/module-fetcher/cache-keys.ts

@@ -15,10 +15,11 @@ import { buildMdxEsmPathCacheKey, buildMdxEsmTransformCacheKey } from "../cache-
  */
 export function getTransformCacheKey(
   projectId: string,
+  contentSourceId: string,
   normalizedPath: string,
   contentHash: string,
 ): string {
-  return buildMdxEsmTransformCacheKey(projectId, normalizedPath, contentHash);
+  return buildMdxEsmTransformCacheKey(projectId, contentSourceId, normalizedPath, contentHash);
 }
 
 export function getVersionedPathCacheKey(normalizedPath: string): string {