veryfront 0.1.1114 → 0.1.1115

package/esm/cli/commands/deploy/command.d.ts

@@ -12,6 +12,7 @@ import { type ApiClient } from "../../shared/config.js";
  * Schema factory for deploy command arguments
  */
 export declare const getDeployArgsSchema: () => import("../../../src/internal-agents/schema.js").Schema<import("../../../src/extensions/schema/schema-validator.js").InferShape<{
+    projectDir: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
     branch: import("../../../src/internal-agents/schema.js").Schema<string>;
     env: import("../../../src/internal-agents/schema.js").Schema<string>;
     releaseName: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
@@ -21,6 +22,7 @@ export declare const getDeployArgsSchema: () => import("../../../src/internal-ag
     quiet: import("../../../src/internal-agents/schema.js").Schema<boolean>;
 }>>;
 export declare const DeployArgsSchema: import("../../../src/internal-agents/schema.js").Schema<import("../../../src/extensions/schema/schema-validator.js").InferShape<{
+    projectDir: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
     branch: import("../../../src/internal-agents/schema.js").Schema<string>;
     env: import("../../../src/internal-agents/schema.js").Schema<string>;
     releaseName: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
@@ -37,6 +39,7 @@ export type DeployOptions = InferSchema<ReturnType<typeof getDeployArgsSchema>>;
  * Parse CLI arguments into validated DeployOptions
  */
 export declare const parseDeployArgs: (args: import("../../shared/types.js").ParsedArgs) => import("../../shared/args.js").SafeParseResult<import("../../../src/extensions/schema/schema-validator.js").InferShape<{
+    projectDir: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
     branch: import("../../../src/internal-agents/schema.js").Schema<string>;
     env: import("../../../src/internal-agents/schema.js").Schema<string>;
     releaseName: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;

package/esm/cli/commands/deploy/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/deploy/command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/deploy/command.ts"],"names":[],"mappings":"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"}

package/esm/cli/commands/deploy/command.js

@@ -19,6 +19,7 @@ import { computeSourceDigest, getProjectTarget, normalizeControlPlane, readPushR
  * Schema factory for deploy command arguments
  */
 export const getDeployArgsSchema = defineSchema((v) => v.object({
+    projectDir: v.string().optional(),
     branch: v.string().min(1).default("main"),
     env: v.string().min(1).default("production"),
     releaseName: v.string().min(1).optional(),
@@ -32,6 +33,7 @@ export const DeployArgsSchema = lazySchema(getDeployArgsSchema);
  * Parse CLI arguments into validated DeployOptions
  */
 export const parseDeployArgs = createArgParser(DeployArgsSchema, {
+    projectDir: CommonArgs.projectDir,
     branch: CommonArgs.branch,
     env: CommonArgs.env,
     releaseName: CommonArgs.releaseName,
@@ -270,11 +272,10 @@ export async function resolvePushedSource(input) {
  * Create a release and deploy to an environment
  */
 export async function deployCommand(options) {
-    const { branch, env, releaseName, dryRun, force, quiet } = options;
+    const { projectDir = cwd(), branch, env, releaseName, dryRun, force, quiet } = options;
     if (isJsonMode()) {
         return deployCommandJson(options);
     }
-    const projectDir = cwd();
     let spinner = quiet ? createNoopSpinner() : createSpinner("Resolving configuration...");
     const config = await resolveConfigWithAuth(projectDir);
     const client = createApiClient(config);
@@ -377,7 +378,7 @@ export async function deployCommand(options) {
     console.log(getPostDeployTips());
 }
 async function deployCommandJson(options) {
-    const { branch, env, releaseName, dryRun, force } = options;
+    const { projectDir = cwd(), branch, env, releaseName, dryRun, force } = options;
     try {
         // JSON mode requires --force or --yes to prevent accidental deploys
         if (requiresExplicitDeployConfirmation(force)) {
@@ -391,7 +392,6 @@ async function deployCommandJson(options) {
             return;
         }
         streamJsonLine({ type: "step", name: "resolve-config", status: "started" });
-        const projectDir = cwd();
         const config = await resolveConfigWithAuth(projectDir);
         const client = createApiClient(config);
         streamJsonLine({ type: "step", name: "resolve-config", status: "completed" });

package/esm/cli/commands/up/command.d.ts

@@ -1,15 +1,18 @@
 import type { InferSchema } from "../../../src/extensions/schema/index.js";
 import { type EnvironmentConfig } from "../../../src/config/index.js";
 export declare const getUpArgsSchema: () => import("../../../src/internal-agents/schema.js").Schema<import("../../../src/extensions/schema/schema-validator.js").InferShape<{
+    projectDir: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
     force: import("../../../src/internal-agents/schema.js").Schema<boolean>;
     dryRun: import("../../../src/internal-agents/schema.js").Schema<boolean>;
 }>>;
 export declare const UpArgsSchema: import("../../../src/internal-agents/schema.js").Schema<import("../../../src/extensions/schema/schema-validator.js").InferShape<{
+    projectDir: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
     force: import("../../../src/internal-agents/schema.js").Schema<boolean>;
     dryRun: import("../../../src/internal-agents/schema.js").Schema<boolean>;
 }>>;
 export type UpOptions = InferSchema<ReturnType<typeof getUpArgsSchema>>;
 export declare const parseUpArgs: (args: import("../../shared/types.js").ParsedArgs) => import("../../shared/args.js").SafeParseResult<import("../../../src/extensions/schema/schema-validator.js").InferShape<{
+    projectDir: import("../../../src/internal-agents/schema.js").Schema<string | undefined>;
     force: import("../../../src/internal-agents/schema.js").Schema<boolean>;
     dryRun: import("../../../src/internal-agents/schema.js").Schema<boolean>;
 }>>;

package/esm/cli/commands/up/command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/up/command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAO3E,OAAO,EAAE,KAAK,iBAAiB,EAAwB,MAAM,8BAA8B,CAAC;AAS5F,eAAO,MAAM,eAAe;;;GAK3B,CAAC;AAEF,eAAO,MAAM,YAAY;;;GAA8B,CAAC;AAExD,MAAM,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC;AAExE,eAAO,MAAM,WAAW;;;GAGtB,CAAC;AAyEH,wBAAsB,SAAS,CAC7B,OAAO,GAAE,OAAO,CAAC,SAAS,CAAM,EAChC,GAAG,GAAE,iBAA0C,GAC9C,OAAO,CAAC,IAAI,CAAC,CA+Gf"}
+{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/up/command.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AAO3E,OAAO,EAAE,KAAK,iBAAiB,EAAwB,MAAM,8BAA8B,CAAC;AAS5F,eAAO,MAAM,eAAe;;;;GAM3B,CAAC;AAEF,eAAO,MAAM,YAAY;;;;GAA8B,CAAC;AAExD,MAAM,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC;AAExE,eAAO,MAAM,WAAW;;;;GAItB,CAAC;AAyEH,wBAAsB,SAAS,CAC7B,OAAO,GAAE,OAAO,CAAC,SAAS,CAAM,EAChC,GAAG,GAAE,iBAA0C,GAC9C,OAAO,CAAC,IAAI,CAAC,CA8Gf"}

package/esm/cli/commands/up/command.js

@@ -14,11 +14,13 @@ import { resolveCliApiUrl } from "../../shared/constants.js";
 import { pushCommand } from "../push/index.js";
 import { deployCommand } from "../deploy/index.js";
 export const getUpArgsSchema = defineSchema((v) => v.object({
+    projectDir: v.string().optional(),
     force: v.boolean().default(false),
     dryRun: v.boolean().default(false),
 }));
 export const UpArgsSchema = lazySchema(getUpArgsSchema);
 export const parseUpArgs = createArgParser(UpArgsSchema, {
+    projectDir: CommonArgs.projectDir,
     force: CommonArgs.force,
     dryRun: CommonArgs.dryRun,
 });
@@ -74,10 +76,9 @@ async function saveConfig(projectDir, config) {
     await fs.writeTextFile(join(projectDir, "veryfront.json"), `${JSON.stringify(config, null, 2)}\n`);
 }
 export async function upCommand(options = {}, env = getEnvironmentConfig()) {
-    const { force = false, dryRun = false } = options;
+    const { projectDir = cwd(), force = false, dryRun = false } = options;
     const useColor = shouldUseColor();
     const c = (fn, s) => (useColor ? fn(s) : s);
-    const projectDir = cwd();
     const userInfo = await ensureAuthenticated(env);
     if (!userInfo)
         return;
@@ -154,6 +155,7 @@ export async function upCommand(options = {}, env = getEnvironmentConfig()) {
         cliLogger.info("");
         try {
             await deployCommand({
+                projectDir,
                 branch: "main",
                 env: "preview",
                 force: true,

package/esm/cli/skills/loader.d.ts

@@ -2,12 +2,12 @@ import type { LoadedSkill } from "./types.js";
 export declare function loadSkill(directory: string): Promise<LoadedSkill | null>;
 export declare function listCoreSkills(): Promise<LoadedSkill[]>;
 /**
- * Scan the current working directory for local skill directories.
+ * Scan the provided project directory for local skill directories.
  * A local skill is any skills/<id>/ directory containing a SKILL.md file.
  */
-export declare function listLocalSkills(): Promise<LoadedSkill[]>;
+export declare function listLocalSkills(baseDir?: string): Promise<LoadedSkill[]>;
 /**
- * List all skills: core (built-in) + local (in cwd).
+ * List all skills: core (built-in) + local (under baseDir).
  */
-export declare function listAllSkills(): Promise<LoadedSkill[]>;
+export declare function listAllSkills(baseDir?: string): Promise<LoadedSkill[]>;
 //# sourceMappingURL=loader.d.ts.map

package/esm/cli/skills/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/cli/skills/loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAO9C,wBAAsB,SAAS,CAC7B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAW7B;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAqB7D;AAED;;;GAGG;AACH,wBAAsB,eAAe,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAgB9D;AAED;;GAEG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAqB5D"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/cli/skills/loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAO9C,wBAAsB,SAAS,CAC7B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAW7B;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAqB7D;AAED;;;GAGG;AACH,wBAAsB,eAAe,CAAC,OAAO,GAAE,MAAc,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAgBrF;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,OAAO,GAAE,MAAc,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAqBnF"}

package/esm/cli/skills/loader.js

@@ -41,13 +41,13 @@ export async function listCoreSkills() {
     return skills;
 }
 /**
- * Scan the current working directory for local skill directories.
+ * Scan the provided project directory for local skill directories.
  * A local skill is any skills/<id>/ directory containing a SKILL.md file.
  */
-export async function listLocalSkills() {
+export async function listLocalSkills(baseDir = cwd()) {
     const fs = createFileSystem();
     const skills = [];
-    const skillsDir = `${cwd()}/skills`;
+    const skillsDir = `${baseDir}/skills`;
     try {
         for await (const entry of fs.readDir(skillsDir)) {
             if (!entry.isDirectory)
@@ -63,12 +63,12 @@ export async function listLocalSkills() {
     return skills;
 }
 /**
- * List all skills: core (built-in) + local (in cwd).
+ * List all skills: core (built-in) + local (under baseDir).
  */
-export async function listAllSkills() {
+export async function listAllSkills(baseDir = cwd()) {
     const [core, local] = await Promise.all([
         listCoreSkills(),
-        listLocalSkills(),
+        listLocalSkills(baseDir),
     ]);
     // Deduplicate by name, local skills override core
     const seen = new Set();

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "veryfront",
-    "version": "0.1.1114",
+    "version": "0.1.1115",
     "license": "Apache-2.0",
     "nodeModulesDir": "auto",
     "minimumDependencyAge": {

package/esm/src/agent/runtime/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/index.ts"],"names":[],"mappings":"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"}

package/esm/src/agent/runtime/index.js

@@ -761,7 +761,7 @@ export class AgentRuntime {
                 }
                 this.status = "tool_execution";
                 addSpanEvent(loopSpan, "tool_execution_start", { count: response.toolCalls.length });
-                let mustLoadSkillFirst = !activeSkillPolicy &&
+                const mustLoadSkillFirstForStep = !activeSkillPolicy &&
                     response.toolCalls.some((tc) => tc.toolName === LOAD_SKILL_TOOL_ID);
                 for (const tc of response.toolCalls) {
                     throwIfAborted(abortSignal);
@@ -830,7 +830,7 @@ export class AgentRuntime {
                             toolCalls.push(toolCall);
                             return;
                         }
-                        const policyCheck = enforceSkillPolicy(tc.toolName, activeSkillPolicy, mustLoadSkillFirst, {
+                        const policyCheck = enforceSkillPolicy(tc.toolName, activeSkillPolicy, mustLoadSkillFirstForStep, {
                             hasSubmittedFormInput: hasSubmittedFormInputInLoop,
                             skillToolAvailability: activeSkillToolAvailability,
                         });
@@ -923,7 +923,6 @@ export class AgentRuntime {
                                     activeSkillToolAvailability = extractSkillToolAvailability(result) ??
                                         INACTIVE_SKILL_TOOL_AVAILABILITY;
                                     activeSkillDelegationOverrides = extractSkillDelegationOverrides(result);
-                                    mustLoadSkillFirst = false;
                                 }
                                 activeSkillPolicy = removeFormInputAfterSubmission(tc.toolName, result, activeSkillId, activeSkillPolicy);
                                 if (isSubmittedFormInputExecutionResult(tc.toolName, result)) {
@@ -1163,7 +1162,7 @@ export class AgentRuntime {
             }
             this.status = "tool_execution";
             const streamedToolCalls = Array.from(state.toolCalls.values());
-            let mustLoadSkillFirst = !activeSkillPolicy &&
+            const mustLoadSkillFirstForStep = !activeSkillPolicy &&
                 streamedToolCalls.some((tc) => tc.name === LOAD_SKILL_TOOL_ID);
             for (const tc of streamedToolCalls) {
                 throwIfAborted(abortSignal);
@@ -1220,7 +1219,6 @@ export class AgentRuntime {
                             activeSkillToolAvailability = extractSkillToolAvailability(matchingResult.output) ??
                                 INACTIVE_SKILL_TOOL_AVAILABILITY;
                             activeSkillDelegationOverrides = extractSkillDelegationOverrides(matchingResult.output);
-                            mustLoadSkillFirst = false;
                         }
                         activeSkillPolicy = removeFormInputAfterSubmission(tc.name, matchingResult.output, activeSkillId, activeSkillPolicy);
                         if (isSubmittedFormInputExecutionResult(tc.name, matchingResult.output)) {
@@ -1246,7 +1244,6 @@ export class AgentRuntime {
                             activeSkillToolAvailability = extractSkillToolAvailability(persistedResult.result) ??
                                 INACTIVE_SKILL_TOOL_AVAILABILITY;
                             activeSkillDelegationOverrides = extractSkillDelegationOverrides(persistedResult.result);
-                            mustLoadSkillFirst = false;
                         }
                         activeSkillPolicy = removeFormInputAfterSubmission(tc.name, persistedResult.result, activeSkillId, activeSkillPolicy);
                         if (isSubmittedFormInputExecutionResult(tc.name, persistedResult.result)) {
@@ -1288,7 +1285,7 @@ export class AgentRuntime {
                     await this.recordToolError(toolCall, `Invalid tool arguments: ${capturedInput.parseError}`, controller, encoder, currentMessages, toolCalls);
                     continue;
                 }
-                const policyCheck = enforceSkillPolicy(tc.name, activeSkillPolicy, mustLoadSkillFirst, {
+                const policyCheck = enforceSkillPolicy(tc.name, activeSkillPolicy, mustLoadSkillFirstForStep, {
                     hasSubmittedFormInput: hasSubmittedFormInputInLoop,
                     skillToolAvailability: activeSkillToolAvailability,
                 });
@@ -1343,7 +1340,6 @@ export class AgentRuntime {
                             activeSkillToolAvailability = extractSkillToolAvailability(result) ??
                                 INACTIVE_SKILL_TOOL_AVAILABILITY;
                             activeSkillDelegationOverrides = extractSkillDelegationOverrides(result);
-                            mustLoadSkillFirst = false;
                         }
                         activeSkillPolicy = removeFormInputAfterSubmission(tc.name, result, activeSkillId, activeSkillPolicy);
                         if (isSubmittedFormInputExecutionResult(tc.name, result)) {

package/esm/src/data/server-data-fetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-data-fetcher.d.ts","sourceRoot":"","sources":["../../../src/src/data/server-data-fetcher.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAcxE;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,2DAA2D;IAC3D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,iBAAiB;IAC5B,KAAK,CACH,UAAU,EAAE,YAAY,EACxB,OAAO,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,UAAU,CAAC;IAuFtB;;OAEG;YACW,aAAa;IAqE3B;;;OAGG;IACH,OAAO,CAAC,QAAQ;CAGjB"}
+{"version":3,"file":"server-data-fetcher.d.ts","sourceRoot":"","sources":["../../../src/src/data/server-data-fetcher.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAcxE;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,2DAA2D;IAC3D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,iBAAiB;IAC5B,KAAK,CACH,UAAU,EAAE,YAAY,EACxB,OAAO,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,UAAU,CAAC;IA2FtB;;OAEG;YACW,aAAa;IAqE3B;;;OAGG;IACH,OAAO,CAAC,QAAQ;CAGjB"}

package/esm/src/data/server-data-fetcher.js

@@ -15,7 +15,9 @@ export class ServerDataFetcher {
         }
         const pathname = context.url?.pathname ?? "unknown";
         const projectId = context.request?.headers?.get("x-project-id") ?? "default";
-        const circuitBreaker = getCircuitBreaker(`data-fetch:${projectId}`, {
+        const isPrefetch = context.request?.headers?.get("x-veryfront-prefetch") === "1";
+        const breakerNamespace = isPrefetch ? "data-prefetch" : "data-fetch";
+        const circuitBreaker = getCircuitBreaker(`${breakerNamespace}:${projectId}`, {
             failureThreshold: 5,
             resetTimeoutMs: 30_000,
             successThreshold: 2,
@@ -55,6 +57,7 @@ export class ServerDataFetcher {
                     serverLogger.warn("DATA_FETCH_CIRCUIT_OPEN circuit breaker open, failing fast", {
                         pathname,
                         projectId,
+                        breakerNamespace,
                         retryAfterMs: error.nextAttemptMs,
                     });
                     throw error;
@@ -79,6 +82,7 @@ export class ServerDataFetcher {
             "data.pathname": pathname,
             "data.timeout_ms": DATA_FETCH_TIMEOUT_MS,
             "data.project_id": projectId,
+            "data.prefetch": isPrefetch,
             "data.isolated": useIsolation,
         });
     }

package/esm/src/html/hydration-script-builder/templates/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../../../src/src/html/hydration-script-builder/templates/router.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,cA6oC3B,CAAC"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../../../src/src/html/hydration-script-builder/templates/router.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,cA4sC3B,CAAC"}

package/esm/src/html/hydration-script-builder/templates/router.js

@@ -39,6 +39,7 @@ export const getRouterScript = () => `
     const IDLE_PREFETCH_DELAY_MS = 1200;
     const IDLE_PREFETCH_MAX_LINKS = 4;
     const VIEWPORT_PREFETCH_MAX_LINKS = 8;
+    const PAGE_DATA_PREFETCH_CONCURRENCY = 2;
     const VIEWPORT_PREFETCH_ROOT_MARGIN = '200px';
     const MAX_ROUTE_TIMINGS = 100;
     const MAX_SERVER_TIMING_LENGTH = 1024;
@@ -54,6 +55,10 @@ export const getRouterScript = () => `
       log(reason + ' failed:', path, message);
     }
 
+    function isAbortError(error) {
+      return error?.name === 'AbortError';
+    }
+
     function getDocumentNonce() {
       const element = document.querySelector('script[nonce], style[nonce], link[nonce]');
       if (!element) return undefined;
@@ -407,11 +412,16 @@ export const getRouterScript = () => `
     async function fetchWithRetry(url, options, maxRetries = MAX_RETRIES) {
       for (let attempt = 0; attempt <= maxRetries; attempt++) {
         const controller = new AbortController();
+        const callerSignal = options.signal;
+        const abortFromCaller = () => controller.abort();
+        if (callerSignal?.aborted) controller.abort();
+        callerSignal?.addEventListener('abort', abortFromCaller, { once: true });
         const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
 
         try {
           const response = await fetch(url, { ...options, signal: controller.signal });
           clearTimeout(timeout);
+          callerSignal?.removeEventListener('abort', abortFromCaller);
 
           if (response.ok) return response;
 
@@ -424,8 +434,9 @@ export const getRouterScript = () => `
           return response;
         } catch (error) {
           clearTimeout(timeout);
+          callerSignal?.removeEventListener('abort', abortFromCaller);
 
-          if (error.name === 'AbortError' && options.signal?.aborted) throw error;
+          if (error.name === 'AbortError' && callerSignal?.aborted) throw error;
           if (attempt === maxRetries) throw error;
 
           log('Fetch failed, retrying...', error.message);
@@ -450,10 +461,13 @@ export const getRouterScript = () => `
       log('Fetching page data:', path);
       perfStart('fetch:' + path);
 
+      const headers = options.prefetch
+        ? { 'X-Veryfront-Prefetch': '1' }
+        : { 'X-Veryfront-Navigation': 'spa' };
       const response = await fetchWithRetry(endpoint, {
-        headers: { 'X-Veryfront-Navigation': 'spa' },
+        headers,
         signal
-      });
+      }, options.prefetch ? 0 : MAX_RETRIES);
 
       if (!response.ok) {
         perfEnd('fetch:' + path);
@@ -504,11 +518,13 @@ export const getRouterScript = () => `
 
     function startPageDataFetch(path, signal, options = {}) {
       const request = fetchPageDataFresh(path, signal, options).finally(() => {
-        if (pendingPageDataFetches.get(path) === request) {
+        if (options.trackPending !== false && pendingPageDataFetches.get(path) === request) {
           pendingPageDataFetches.delete(path);
         }
       });
-      pendingPageDataFetches.set(path, request);
+      if (options.trackPending !== false) {
+        pendingPageDataFetches.set(path, request);
+      }
       return request;
     }
 
@@ -555,12 +571,15 @@ export const getRouterScript = () => `
       });
     }
 
-    async function fetchPageDataForPrefetch(path) {
+    async function fetchPageDataForPrefetch(path, signal) {
       if (getCachedPageData(path)) return;
-      return fetchPageDataDeduped(path)
+      return startPageDataFetch(path, signal, { prefetch: true, trackPending: false })
         .then((data) => preloadModulesForPageData(data, path))
         .catch((error) => {
-          logBackgroundFetchFailure('Page data prefetch', path, error);
+          if (!isAbortError(error)) {
+            logBackgroundFetchFailure('Page data prefetch', path, error);
+          }
+          throw error;
         });
     }
 
@@ -578,6 +597,9 @@ export const getRouterScript = () => `
 
       if (isNavigating) return;
       isNavigating = true;
+      const [navigationPath] = href.split('#');
+      removeQueuedPrefetch(navigationPath || href);
+      abortActiveSpeculativePrefetches();
 
       currentAbortController = new AbortController();
       const signal = currentAbortController.signal;
@@ -654,6 +676,7 @@ export const getRouterScript = () => `
       } finally {
         isNavigating = false;
         currentAbortController = null;
+        processPageDataPrefetchQueue();
       }
     }
 
@@ -810,6 +833,9 @@ export const getRouterScript = () => `
     const observedPrefetchLinks = new WeakSet();
     const prefetchedPaths = new Set();
     const inFlightPrefetches = new Set();
+    const queuedPrefetchPaths = new Set();
+    const pageDataPrefetchQueue = [];
+    const activePageDataPrefetchControllers = new Map();
 
     function cancelScheduledPrefetch() {
       if (prefetchTimeout) {
@@ -895,9 +921,58 @@ export const getRouterScript = () => `
       }
     }
 
+    function removeQueuedPrefetch(path) {
+      queuedPrefetchPaths.delete(path);
+      for (let i = pageDataPrefetchQueue.length - 1; i >= 0; i--) {
+        if (pageDataPrefetchQueue[i] === path) pageDataPrefetchQueue.splice(i, 1);
+      }
+    }
+
+    function abortActiveSpeculativePrefetches() {
+      for (const controller of activePageDataPrefetchControllers.values()) {
+        controller.abort();
+      }
+    }
+
+    function processPageDataPrefetchQueue() {
+      if (isNavigating) return;
+
+      while (
+        activePageDataPrefetchControllers.size < PAGE_DATA_PREFETCH_CONCURRENCY &&
+        pageDataPrefetchQueue.length > 0
+      ) {
+        const href = pageDataPrefetchQueue.shift();
+        queuedPrefetchPaths.delete(href);
+
+        if (prefetchedPaths.has(href) || inFlightPrefetches.has(href) || getCachedPageData(href)) {
+          continue;
+        }
+
+        if (prefetchedPaths.size >= MAX_PREFETCH_PATHS) {
+          const oldest = prefetchedPaths.values().next().value;
+          if (oldest) prefetchedPaths.delete(oldest);
+        }
+
+        const controller = new AbortController();
+        prefetchedPaths.add(href);
+        inFlightPrefetches.add(href);
+        activePageDataPrefetchControllers.set(href, controller);
+
+        fetchPageDataForPrefetch(href, controller.signal)
+          .catch(() => {
+            prefetchedPaths.delete(href);
+          })
+          .finally(() => {
+            inFlightPrefetches.delete(href);
+            activePageDataPrefetchControllers.delete(href);
+            processPageDataPrefetchQueue();
+          });
+      }
+    }
+
     function prefetchPage(href) {
       if (isNavigating) return;
-      if (prefetchedPaths.has(href) || inFlightPrefetches.has(href)) return;
+      if (prefetchedPaths.has(href) || inFlightPrefetches.has(href) || queuedPrefetchPaths.has(href)) return;
 
       const cachedPageData = getCachedPageData(href);
       if (cachedPageData) {
@@ -907,21 +982,9 @@ export const getRouterScript = () => `
         return;
       }
 
-      if (prefetchedPaths.size >= MAX_PREFETCH_PATHS) {
-        const oldest = prefetchedPaths.values().next().value;
-        if (oldest) prefetchedPaths.delete(oldest);
-      }
-
-      prefetchedPaths.add(href);
-      inFlightPrefetches.add(href);
-
-      fetchPageDataForPrefetch(href)
-        .catch(() => {
-          prefetchedPaths.delete(href);
-        })
-        .finally(() => {
-          inFlightPrefetches.delete(href);
-        });
+      queuedPrefetchPaths.add(href);
+      pageDataPrefetchQueue.push(href);
+      processPageDataPrefetchQueue();
     }
 
     function prefetchEligibleRouteLinks(limit) {

package/esm/src/rendering/orchestrator/pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,iCAAiC,CAAC;AASzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA4DhF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE1D;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxE,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrF;AAED,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAC;IACjC,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,yEAAyE;IACzE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2EAA2E;IAC3E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,wEAAwE;IACxE,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,6CAA6C;IAC7C,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,OAAO,qBAAqB,EAAE,sBAAsB,CAAC;CAC1E;AA0BD,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,mBAAmB,CAAgC;gBAE/C,MAAM,EAAE,oBAAoB;IAcxC,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,oBAAoB;IA0B5B;;;;OAIG;YACW,yBAAyB;IAWvC;;;OAGG;IACH,gBAAgB,IAAI,IAAI;IAKxB,OAAO,CAAC,UAAU;YAOJ,0BAA0B;IAaxC;;;;;;;;;OASG;YACW,qBAAqB;IA6EnC;;;OAGG;YACW,mBAAmB;IAoHjC,OAAO,CAAC,uBAAuB;IAkCzB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAyT9E,+EAA+E;IACzE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAsHzE,kBAAkB;YA2ClB,cAAc;IAW5B,OAAO,CAAC,uBAAuB;YAYjB,kBAAkB;IAyFhC,OAAO,CAAC,kBAAkB;YAQZ,uBAAuB;IAmBrC;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;CAStB"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../../src/src/rendering/orchestrator/pipeline.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,OAAO,EAIL,KAAK,iBAAiB,EACvB,MAAM,iCAAiC,CAAC;AASzC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA4DhF,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE1D;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACxE,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACrF;AAED,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,YAAY,EAAE,YAAY,CAAC;IAC3B,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAC;IACjC,OAAO,EAAE,cAAc,CAAC;IACxB,IAAI,EAAE,aAAa,GAAG,YAAY,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,yEAAyE;IACzE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2EAA2E;IAC3E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,wEAAwE;IACxE,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,6CAA6C;IAC7C,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,8EAA8E;IAC9E,iBAAiB,CAAC,EAAE,OAAO,qBAAqB,EAAE,sBAAsB,CAAC;CAC1E;AAqCD,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,mBAAmB,CAAgC;gBAE/C,MAAM,EAAE,oBAAoB;IAcxC,OAAO,CAAC,eAAe;IAQvB,OAAO,CAAC,oBAAoB;IA0B5B;;;;OAIG;YACW,yBAAyB;IAWvC;;;OAGG;IACH,gBAAgB,IAAI,IAAI;IAKxB,OAAO,CAAC,UAAU;YAOJ,0BAA0B;IAaxC;;;;;;;;;OASG;YACW,qBAAqB;IA6EnC;;;OAGG;YACW,mBAAmB;IAoHjC,OAAO,CAAC,uBAAuB;IAkCzB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC;IAqU9E,+EAA+E;IACzE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAsHzE,kBAAkB;YA2ClB,cAAc;IAW5B,OAAO,CAAC,uBAAuB;YAYjB,kBAAkB;IA6FhC,OAAO,CAAC,kBAAkB;YAQZ,uBAAuB;IAmBrC;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;CAStB"}

package/esm/src/rendering/orchestrator/pipeline.js

@@ -51,6 +51,11 @@ const renderPipelineLog = logger.component("render-pipeline");
 const resolvePageDataLog = logger.component("resolve-page-data");
 // Re-export test helper for backward compatibility
 export { __injectCssCacheForTests } from "./css-cache.js";
+const PRE_RESOLVED_DATA = Symbol("veryfront.preResolvedData");
+function stripInternalRenderOptions(options) {
+    const { [PRE_RESOLVED_DATA]: _preResolvedData, ...publicOptions } = options;
+    return publicOptions;
+}
 export class RenderPipeline {
     config;
     dataFetcher;
@@ -336,7 +341,18 @@ export class RenderPipeline {
                         : {};
                     let layoutDataMap = new Map();
                     const dataFetchStart = performance.now();
-                    if (options?.url && (options.request || options.staticDataOnly)) {
+                    const internalPreResolvedData = options?.[PRE_RESOLVED_DATA];
+                    const renderInputOptions = internalPreResolvedData && options
+                        ? stripInternalRenderOptions(options)
+                        : options;
+                    if (internalPreResolvedData) {
+                        resolvedParams = internalPreResolvedData.params;
+                        dataFetchingProps = Object.keys(internalPreResolvedData.pageProps).length > 0
+                            ? internalPreResolvedData.pageProps
+                            : undefined;
+                        layoutDataMap = internalPreResolvedData.layoutProps;
+                    }
+                    else if (options?.url && (options.request || options.staticDataOnly)) {
                         await profilePhase("render.data_fetching", () => withSpan("render.data_fetching", async () => {
                             try {
                                 const dataResolution = await this.resolveDataFetching(slug, pageInfo.entity.path, layoutResult.nestedLayouts, options);
@@ -361,13 +377,13 @@ export class RenderPipeline {
                     const hasResolvedParams = Object.keys(resolvedParams).length > 0;
                     const mergedOptions = (dataFetchingProps || hasResolvedParams)
                         ? {
-                            ...options,
+                            ...renderInputOptions,
                             ...(hasResolvedParams ? { params: resolvedParams } : {}),
                             ...(dataFetchingProps
-                                ? { props: { ...options?.props, ...dataFetchingProps } }
+                                ? { props: { ...renderInputOptions?.props, ...dataFetchingProps } }
                                 : {}),
                         }
-                        : options;
+                        : renderInputOptions;
                     const bundlePrepStart = performance.now();
                     const pageBundleResult = await profilePhase("render.prepare_bundles", () => withSpan("render.prepare_bundles", () => this.config.pageRenderer.preparePageBundles(pageInfo, slug, cacheResult?.cachedModule, mergedOptions), { "render.slug": slug }));
                     timing.bundlePrep = Math.round(performance.now() - bundlePrepStart);
@@ -512,7 +528,7 @@ export class RenderPipeline {
         const appPath = pageIslandPlan
             ? undefined
             : await profilePhase("page_data.resolve_app_path", () => this.resolveAppPath());
-        const { css, cssAction, cssError } = await profilePhase("page_data.resolve_css", () => this.resolvePageDataCss(slug, options, projectUpdatedAt));
+        const { css, cssAction, cssError } = await profilePhase("page_data.resolve_css", () => this.resolvePageDataCss(slug, options, projectUpdatedAt, dataResolution));
         resolvePageDataLog.debug("Resolved page data", {
             slug,
             pagePath,
@@ -593,7 +609,7 @@ export class RenderPipeline {
         const wrappedAdapter = fs.getUnderlyingAdapter();
         return wrappedAdapter.getProjectData?.()?.updated_at;
     }
-    async resolvePageDataCss(slug, options, projectUpdatedAt) {
+    async resolvePageDataCss(slug, options, projectUpdatedAt, dataResolution) {
         if (this.hasReadyReleaseCss(options)) {
             return { css: undefined, cssAction: "clear", cssError: undefined };
         }
@@ -604,12 +620,14 @@ export class RenderPipeline {
             return { css: cachedCss, cssAction: undefined, cssError: undefined };
         }
         try {
-            const renderResult = await profilePhase("page_data.css.render_html", () => withTimeout(this.renderPage(slug, {
+            const cssRenderOptions = {
                 ...options,
                 delivery: "string",
                 skipCacheCheck: true,
                 skipCachePersist: true,
-            }), CSS_SSR_TIMEOUT_MS, `CSS SSR for ${slug}`));
+                [PRE_RESOLVED_DATA]: dataResolution,
+            };
+            const renderResult = await profilePhase("page_data.css.render_html", () => withTimeout(this.renderPage(slug, cssRenderOptions), CSS_SSR_TIMEOUT_MS, `CSS SSR for ${slug}`));
             if (!renderResult?.html) {
                 return { css: undefined, cssAction: undefined, cssError: undefined };
             }

package/esm/src/rendering/script-page-handling.js

@@ -261,5 +261,5 @@ async function loadScriptModule(modulePath, projectDir, adapter) {
     const resolveDir = dirname(normalizedPath) || projectDir;
     const transpiled = await transpileWithEsbuild(source, modulePath, resolveDir);
     logger.debug(`Transpiled ${modulePath}`);
-    return importFromTempFile(fs, rewriteNpmImports(transpiled));
+    return importFromTempFile(fs, rewriteNpmImports(transpiled, projectDir));
 }

package/esm/src/routing/api/module-loader/external-import-rewriter.js

@@ -419,7 +419,7 @@ export async function rewriteExternalImports(code, projectDir, fs, userDeps = ne
         }
     }
     if (isDeno) {
-        transformed = rewriteNpmImports(transformed);
+        transformed = rewriteNpmImports(transformed, projectDir);
         transformed = rewriteDenoNodeBuiltinImports(transformed);
         // Rewrite user-installed npm dependencies.
         // In non-compiled Deno: use npm: specifiers (resolved by Deno's npm support).

package/esm/src/sandbox/lazy-sandbox.d.ts

@@ -99,6 +99,7 @@ export declare class LazySandbox {
     private waitForExecStartRetry;
     private reprovisionAfterExecStartFailure;
     private resolveRuntimeEndpointFor;
+    private shouldUseInternalDataPlane;
     private resolveDataPlaneRoute;
     private requireSessionId;
     private authHeaders;

package/esm/src/sandbox/lazy-sandbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lazy-sandbox.d.ts","sourceRoot":"","sources":["../../../src/src/sandbox/lazy-sandbox.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lazy-sandbox.d.ts","sourceRoot":"","sources":["../../../src/src/sandbox/lazy-sandbox.ts"],"names":[],"mappings":"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"}

package/esm/src/sandbox/lazy-sandbox.js

@@ -422,7 +422,9 @@ export class LazySandbox {
         const readySession = session.status === "running"
             ? session
             : await this.waitForReadySession(session.id);
-        await this.waitForRuntimeDataPlaneReady(readySession);
+        if (this.shouldUseInternalDataPlane(readySession.endpoint, readySession.id)) {
+            await this.waitForRuntimeDataPlaneReady(readySession);
+        }
         return readySession.endpoint;
     }
     async attachExistingSession(sessionId) {
@@ -653,14 +655,28 @@ export class LazySandbox {
         return this.resolveRuntimeEndpointOption?.({ endpoint, sessionId }) ??
             resolveDefaultSandboxRuntimeEndpoint({ endpoint });
     }
+    shouldUseInternalDataPlane(endpoint, sessionId) {
+        if (!this.resolveRuntimeEndpointOption) {
+            return false;
+        }
+        const runtimeEndpoint = this.resolveRuntimeEndpointFor(endpoint, sessionId);
+        return normalizeDataPlaneBaseUrl(runtimeEndpoint) !== normalizeDataPlaneBaseUrl(endpoint);
+    }
     resolveDataPlaneRoute() {
         const endpoint = this.requireEndpoint();
         const sessionId = this.requireSessionId();
+        if (!this.resolveRuntimeEndpointOption) {
+            return {
+                baseUrl: sandboxSessionRoute(this.apiUrl, sessionId),
+                kind: "proxy",
+            };
+        }
         const runtimeEndpoint = this.resolveRuntimeEndpointFor(endpoint, sessionId);
-        const normalizedEndpoint = normalizeDataPlaneBaseUrl(endpoint);
-        const normalizedRuntimeEndpoint = normalizeDataPlaneBaseUrl(runtimeEndpoint);
-        if (normalizedRuntimeEndpoint !== normalizedEndpoint) {
-            return { baseUrl: normalizedRuntimeEndpoint, kind: "internal" };
+        if (normalizeDataPlaneBaseUrl(runtimeEndpoint) !== normalizeDataPlaneBaseUrl(endpoint)) {
+            return {
+                baseUrl: normalizeDataPlaneBaseUrl(runtimeEndpoint),
+                kind: "internal",
+            };
         }
         return {
             baseUrl: sandboxSessionRoute(this.apiUrl, sessionId),

package/esm/src/server/handlers/request/module/page-data-endpoint-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page-data-endpoint-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/src/server/handlers/request/module/page-data-endpoint-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AA8EhE,wBAAgB,oCAAoC,IAAI,IAAI,CAE3D;AAED,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,cAAc,EACnB,qBAAqB,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,eAAe,EAC/D,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,aAAa,EAC9C,eAAe,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,GAC1C,OAAO,CAAC,aAAa,CAAC,CA6GxB"}
+{"version":3,"file":"page-data-endpoint-handler.d.ts","sourceRoot":"","sources":["../../../../../../src/src/server/handlers/request/module/page-data-endpoint-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AA8EhE,wBAAgB,oCAAoC,IAAI,IAAI,CAE3D;AAED,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,cAAc,EACnB,qBAAqB,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,eAAe,EAC/D,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,aAAa,EAC9C,eAAe,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,GAC1C,OAAO,CAAC,aAAa,CAAC,CAgHxB"}

package/esm/src/server/handlers/request/module/page-data-endpoint-handler.js

@@ -58,9 +58,12 @@ export function handlePageDataEndpoint(req, pathname, ctx, createResponseBuilder
                 .replace(/\.json$/, "") || "";
             const url = new URL(req.url);
             const renderer = await getRendererForProject(ctx);
-            const cacheKey = !isPageDataCacheEnabled() || requestHasCacheSensitiveState(req)
-                ? null
-                : buildPageDataCacheKey(ctx, slug, url);
+            const isSpeculativePrefetch = req.headers.get("x-veryfront-prefetch") === "1";
+            // The request reaches server-data hooks, so prefetch work cannot safely
+            // populate or join the foreground response cache/singleflight.
+            const canUsePageDataCache = isPageDataCacheEnabled() &&
+                !requestHasCacheSensitiveState(req) && !isSpeculativePrefetch;
+            const cacheKey = canUsePageDataCache ? buildPageDataCacheKey(ctx, slug, url) : null;
             const cachePolicy = cacheKey ? getPageDataCachePolicy(ctx) : null;
             const payload = cacheKey
                 ? await resolveCachedPageData(cacheKey, () => withTimeoutThrow(renderer.resolvePageData(slug, { request: req, url }), PAGE_DATA_TIMEOUT_MS, `resolvePageData for ${slug}`), cachePolicy)

package/esm/src/transforms/npm-import-rewrites.d.ts

@@ -10,15 +10,15 @@ interface RewriteRule {
 declare function buildRules(importMap: Record<string, string>): RewriteRule[];
 /**
  * Returns rewrite rules derived from deno.json's import map.
- * Rules are cached after first call.
+ * Rules are cached per resolved project directory.
  */
-export declare function getNpmRewriteRules(): RewriteRule[];
+export declare function getNpmRewriteRules(baseDir?: string): RewriteRule[];
 /**
  * Apply npm import rewrites to source code.
  * Rewrites bare specifiers to pinned npm: versions from deno.json.
  * No-op on Node.js where bare specifiers resolve via node_modules.
  */
-export declare function rewriteNpmImports(source: string): string;
+export declare function rewriteNpmImports(source: string, baseDir?: string): string;
 /** Exported for testing */
 export { buildRules, REWRITABLE_PACKAGES };
 /** @internal Reset cached rules — only for testing */

package/esm/src/transforms/npm-import-rewrites.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"npm-import-rewrites.d.ts","sourceRoot":"","sources":["../../../src/src/transforms/npm-import-rewrites.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AACH,QAAA,MAAM,mBAAmB,aAAc,CAAC;AAExC,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AAQD,iBAAS,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,WAAW,EAAE,CA6BpE;AAcD;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,WAAW,EAAE,CAKlD;AAID;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAOxD;AAED,2BAA2B;AAC3B,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,CAAC;AAE3C,sDAAsD;AACtD,wBAAgB,WAAW,IAAI,IAAI,CAElC"}
+{"version":3,"file":"npm-import-rewrites.d.ts","sourceRoot":"","sources":["../../../src/src/transforms/npm-import-rewrites.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AACH,QAAA,MAAM,mBAAmB,aAAc,CAAC;AAExC,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AAQD,iBAAS,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,WAAW,EAAE,CA6BpE;AAyBD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,GAAE,MAAc,GAAG,WAAW,EAAE,CASzE;AAID;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,MAAc,GAAG,MAAM,CAOjF;AAED,2BAA2B;AAC3B,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,CAAC;AAE3C,sDAAsD;AACtD,wBAAgB,WAAW,IAAI,IAAI,CAElC"}

package/esm/src/transforms/npm-import-rewrites.js

@@ -10,13 +10,13 @@
  */
 import * as dntShim from "../../_dnt.shims.js";
 import { cwd } from "../platform/compat/process.js";
-import { join } from "../platform/compat/path/index.js";
+import { join, resolve } from "../platform/compat/path/index.js";
 /**
  * Bare specifiers that should be rewritten to their pinned npm: versions.
  * Each must have a corresponding entry in deno.json's import map.
  */
 const REWRITABLE_PACKAGES = [];
-let cachedRules;
+let cachedRules = new Map();
 function escapeForRegex(pkg) {
     return pkg.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -46,9 +46,9 @@ function buildRules(importMap) {
     }
     return rules;
 }
-function loadImportMapSync() {
+function loadImportMapSync(baseDir = cwd()) {
     try {
-        const denoJsonPath = join(cwd(), "deno.json");
+        const denoJsonPath = join(baseDir, "deno.json");
         const content = dntShim.Deno.readTextFileSync(denoJsonPath);
         const config = JSON.parse(content);
         return config.imports ?? {};
@@ -58,16 +58,31 @@ function loadImportMapSync() {
         return {};
     }
 }
+function resolveProjectDir(baseDir) {
+    const resolvedBaseDir = resolve(baseDir);
+    let canonicalBaseDir = resolvedBaseDir;
+    try {
+        canonicalBaseDir = dntShim.Deno.realPathSync(resolvedBaseDir);
+    }
+    catch {
+        // expected: user projects may not exist yet in some compiled-binary paths
+    }
+    return canonicalBaseDir;
+}
 /**
  * Returns rewrite rules derived from deno.json's import map.
- * Rules are cached after first call.
+ * Rules are cached per resolved project directory.
  */
-export function getNpmRewriteRules() {
-    if (cachedRules)
-        return cachedRules;
-    const importMap = loadImportMapSync();
-    cachedRules = buildRules(importMap);
-    return cachedRules;
+export function getNpmRewriteRules(baseDir = cwd()) {
+    const projectDir = resolveProjectDir(baseDir);
+    const cacheKey = projectDir;
+    const cached = cachedRules.get(cacheKey);
+    if (cached)
+        return cached;
+    const importMap = loadImportMapSync(projectDir);
+    const rules = buildRules(importMap);
+    cachedRules.set(cacheKey, rules);
+    return rules;
 }
 const isDeno = typeof dntShim.dntGlobalThis.Deno !== "undefined";
 /**
@@ -75,11 +90,11 @@ const isDeno = typeof dntShim.dntGlobalThis.Deno !== "undefined";
  * Rewrites bare specifiers to pinned npm: versions from deno.json.
  * No-op on Node.js where bare specifiers resolve via node_modules.
  */
-export function rewriteNpmImports(source) {
+export function rewriteNpmImports(source, baseDir = cwd()) {
     if (!isDeno)
         return source;
     let result = source;
-    for (const { pattern, replacement } of getNpmRewriteRules()) {
+    for (const { pattern, replacement } of getNpmRewriteRules(baseDir)) {
         result = result.replace(pattern, replacement);
     }
     return result;
@@ -88,5 +103,5 @@ export function rewriteNpmImports(source) {
 export { buildRules, REWRITABLE_PACKAGES };
 /** @internal Reset cached rules — only for testing */
 export function _resetCache() {
-    cachedRules = undefined;
+    cachedRules = new Map();
 }

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

@@ -1,3 +1,3 @@
 /** Shared version value. */
-export declare const VERSION = "0.1.1114";
+export declare const VERSION = "0.1.1115";
 //# sourceMappingURL=version-constant.d.ts.map

package/esm/src/utils/version-constant.js

@@ -1,4 +1,4 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
 /** Shared version value. */
-export const VERSION = "0.1.1114";
+export const VERSION = "0.1.1115";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.1114",
+  "version": "0.1.1115",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",
@@ -332,10 +332,10 @@
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
     "ws": "8.21.0",
-    "@veryfront/ext-bundler-esbuild": "0.1.1114",
-    "@veryfront/ext-content-mdx": "0.1.1114",
-    "@veryfront/ext-css-tailwind": "0.1.1114",
-    "@veryfront/ext-parser-babel": "0.1.1114"
+    "@veryfront/ext-bundler-esbuild": "0.1.1115",
+    "@veryfront/ext-content-mdx": "0.1.1115",
+    "@veryfront/ext-css-tailwind": "0.1.1115",
+    "@veryfront/ext-parser-babel": "0.1.1115"
   },
   "devDependencies": {
     "@types/node": "20.9.0"