veryfront 0.1.1113 → 0.1.1115

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

@@ -2,6 +2,7 @@ import { REQUEST_ERROR } from "../errors/index.js";
 import { getHostEnv } from "../platform/compat/process.js";
 import { logger } from "../utils/index.js";
 import { resolveSandboxApiUrl, resolveSandboxAuthToken } from "./config.js";
+import { readSandboxFileContent, sandboxSessionRoute } from "./proxy-routes.js";
 const DEFAULT_STARTUP_TIMEOUT_MS = 180_000;
 const DEFAULT_POLL_INTERVAL_MS = 2_000;
 const DEFAULT_HEARTBEAT_INTERVAL_MS = 30_000;
@@ -39,6 +40,9 @@ export function resolveDefaultSandboxRuntimeEndpoint(input) {
     }
     return `http://sandbox.veryfront-sandbox-${shortId}.svc.cluster.local`;
 }
+function normalizeDataPlaneBaseUrl(url) {
+    return url.trim().replace(/\/+$/, "");
+}
 /** Lazily provisions sandbox sessions and keeps them alive while in use. */
 export class LazySandbox {
     apiUrl;
@@ -64,7 +68,7 @@ export class LazySandbox {
     heartbeatPromise = null;
     heartbeatTimer = null;
     lastHeartbeatAt = 0;
-    activeBackgroundCommandEndpoints = new Map();
+    activeBackgroundCommands = new Map();
     constructor(options = {}) {
         this.apiUrl = resolveSandboxApiUrl(options);
         this.authToken = resolveSandboxAuthToken(options);
@@ -141,36 +145,48 @@ export class LazySandbox {
         const reader = res.body.getReader();
         const decoder = new TextDecoder();
         let buffer = "";
-        while (true) {
-            const { done, value } = await reader.read();
-            if (done)
-                break;
-            buffer += decoder.decode(value, { stream: true });
-            const lines = buffer.split("\n");
-            buffer = lines.pop() ?? "";
-            for (const line of lines) {
-                if (!line.trim())
-                    continue;
-                yield JSON.parse(line);
+        let completed = false;
+        try {
+            while (true) {
+                const { done, value } = await reader.read();
+                if (done) {
+                    completed = true;
+                    break;
+                }
+                buffer += decoder.decode(value, { stream: true });
+                const lines = buffer.split("\n");
+                buffer = lines.pop() ?? "";
+                for (const line of lines) {
+                    if (!line.trim())
+                        continue;
+                    yield JSON.parse(line);
+                }
+            }
+            buffer += decoder.decode();
+            if (buffer.trim()) {
+                yield JSON.parse(buffer);
             }
         }
-        if (buffer.trim()) {
-            yield JSON.parse(buffer);
+        finally {
+            if (!completed) {
+                await reader.cancel().catch(() => { });
+            }
+            reader.releaseLock();
         }
     }
     async readFile(path) {
         await this.touchSession();
-        const res = await this.fetchControl(`${this.requireEndpoint()}/file?path=${encodeURIComponent(path)}`, {
+        const res = await this.fetchControl(`${this.resolveDataPlaneRoute().baseUrl}/file?path=${encodeURIComponent(path)}`, {
             headers: this.authHeaders(),
         });
         if (!res.ok) {
             throw REQUEST_ERROR.create({ detail: `Read file failed: ${res.status} ${await res.text()}` });
         }
-        return await res.text();
+        return await readSandboxFileContent(res);
     }
     async writeFiles(files) {
         await this.touchSession();
-        const res = await this.fetchControl(`${this.requireEndpoint()}/files`, {
+        const res = await this.fetchControl(`${this.resolveDataPlaneRoute().baseUrl}/files`, {
             method: "POST",
             headers: this.jsonHeaders(),
             body: JSON.stringify({ files }),
@@ -183,8 +199,9 @@ export class LazySandbox {
     }
     async startBackgroundCommand(command, options) {
         await this.touchSession();
-        const endpoint = this.resolveRuntimeEndpoint();
-        const res = await this.fetchControl(`${endpoint}/exec/commands`, {
+        const route = this.resolveDataPlaneRoute();
+        const commandsUrl = backgroundCommandsUrl(route);
+        const res = await this.fetchControl(commandsUrl, {
             method: "POST",
             headers: this.jsonHeaders(),
             body: JSON.stringify({ command, ...this.resolveExecOptions(options) }),
@@ -195,12 +212,15 @@ export class LazySandbox {
             });
         }
         const backgroundCommand = mapBackgroundCommand(await res.json());
-        this.updateTrackedBackgroundCommand(backgroundCommand, endpoint);
+        this.updateTrackedBackgroundCommand(backgroundCommand, {
+            commandsUrl,
+            routeKind: route.kind,
+        });
         return backgroundCommand;
     }
     async getBackgroundCommand(commandId) {
-        const endpoint = await this.resolveBackgroundCommandEndpoint(commandId);
-        const res = await this.fetchControl(`${endpoint}/exec/commands/${encodeURIComponent(commandId)}`, {
+        const route = await this.resolveBackgroundCommandRoute(commandId);
+        const res = await this.fetchControl(`${route.commandsUrl}/${encodeURIComponent(commandId)}`, {
             headers: this.authHeaders(),
         });
         if (!res.ok) {
@@ -209,12 +229,12 @@ export class LazySandbox {
             });
         }
         const backgroundCommand = mapBackgroundCommand(await res.json());
-        this.updateTrackedBackgroundCommand(backgroundCommand, endpoint);
+        this.updateTrackedBackgroundCommand(backgroundCommand, route);
         return backgroundCommand;
     }
     async getBackgroundCommandOutput(commandId) {
-        const endpoint = await this.resolveBackgroundCommandEndpoint(commandId);
-        const res = await this.fetchControl(`${endpoint}/exec/commands/${encodeURIComponent(commandId)}/output`, {
+        const route = await this.resolveBackgroundCommandRoute(commandId);
+        const res = await this.fetchControl(`${route.commandsUrl}/${encodeURIComponent(commandId)}/output`, {
             headers: this.authHeaders(),
         });
         if (!res.ok) {
@@ -230,12 +250,12 @@ export class LazySandbox {
             stdoutTruncated: json.stdout_truncated,
             stderrTruncated: json.stderr_truncated,
         };
-        this.updateTrackedBackgroundCommand(output, endpoint);
+        this.updateTrackedBackgroundCommand(output, route);
         return output;
     }
     async listBackgroundCommands() {
         await this.ensure();
-        const res = await this.fetchControl(`${this.requireEndpoint()}/exec/commands`, {
+        const res = await this.fetchControl(backgroundCommandsUrl(this.resolveDataPlaneRoute()), {
             headers: this.authHeaders(),
         });
         if (!res.ok) {
@@ -248,8 +268,8 @@ export class LazySandbox {
         return commands.map((command) => mapBackgroundCommand(command));
     }
     async cancelBackgroundCommand(commandId) {
-        const endpoint = await this.resolveBackgroundCommandEndpoint(commandId);
-        const res = await this.fetchControl(`${endpoint}/exec/commands/${encodeURIComponent(commandId)}/cancel`, {
+        const route = await this.resolveBackgroundCommandRoute(commandId);
+        const res = await this.fetchControl(`${route.commandsUrl}/${encodeURIComponent(commandId)}/cancel`, {
             method: "POST",
             headers: this.authHeaders(),
         });
@@ -259,7 +279,7 @@ export class LazySandbox {
             });
         }
         const backgroundCommand = mapBackgroundCommand(await res.json());
-        this.updateTrackedBackgroundCommand(backgroundCommand, endpoint);
+        this.updateTrackedBackgroundCommand(backgroundCommand, route);
         return backgroundCommand;
     }
     async heartbeat(force = false) {
@@ -282,7 +302,7 @@ export class LazySandbox {
                 });
                 if (!res.ok) {
                     if (this.sessionId === currentSessionId) {
-                        if (this.activeBackgroundCommandEndpoints.size === 0) {
+                        if (this.activeBackgroundCommands.size === 0) {
                             await this.deleteSession(currentSessionId);
                             this.resetSessionState(currentSessionId);
                         }
@@ -402,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) {
@@ -497,7 +519,7 @@ export class LazySandbox {
     heartbeatFailureCount = 0;
     static HEARTBEAT_WARN_AFTER_FAILURES = 3;
     startHeartbeatLoop() {
-        if (!this.sessionId || this.heartbeatTimer || this.activeBackgroundCommandEndpoints.size > 0) {
+        if (!this.sessionId || this.heartbeatTimer || this.hasActiveInternalBackgroundCommand()) {
             return;
         }
         this.heartbeatTimer = setInterval(() => {
@@ -536,7 +558,7 @@ export class LazySandbox {
     resetSessionState(sessionId) {
         if (!sessionId || this.sessionId === sessionId) {
             this.stopHeartbeatLoop();
-            this.activeBackgroundCommandEndpoints.clear();
+            this.activeBackgroundCommands.clear();
             this.endpoint = null;
             this.sessionId = null;
             this.sessionProjectId = null;
@@ -548,33 +570,47 @@ export class LazySandbox {
         const projectReference = options?.projectReference ?? this.resolveProjectId() ?? undefined;
         return projectReference ? { ...options, projectReference } : options;
     }
-    async resolveBackgroundCommandEndpoint(commandId) {
-        const trackedEndpoint = this.activeBackgroundCommandEndpoints.get(commandId);
-        if (trackedEndpoint) {
-            return trackedEndpoint;
+    async resolveBackgroundCommandRoute(commandId) {
+        const trackedCommand = this.activeBackgroundCommands.get(commandId);
+        if (trackedCommand) {
+            return trackedCommand;
         }
         await this.ensure();
-        return this.resolveRuntimeEndpoint();
+        const route = this.resolveDataPlaneRoute();
+        return {
+            commandsUrl: backgroundCommandsUrl(route),
+            routeKind: route.kind,
+        };
     }
-    updateTrackedBackgroundCommand(backgroundCommand, endpoint) {
+    updateTrackedBackgroundCommand(backgroundCommand, command) {
         if (backgroundCommand.status === "running") {
-            this.activeBackgroundCommandEndpoints.set(backgroundCommand.id, endpoint);
-            this.stopHeartbeatLoop();
+            this.activeBackgroundCommands.set(backgroundCommand.id, command);
+            if (command.routeKind === "internal") {
+                this.stopHeartbeatLoop();
+            }
             return;
         }
-        if (!this.activeBackgroundCommandEndpoints.delete(backgroundCommand.id)) {
+        if (!this.activeBackgroundCommands.delete(backgroundCommand.id)) {
             return;
         }
-        if (this.activeBackgroundCommandEndpoints.size === 0 && this.endpoint) {
+        if (!this.hasActiveInternalBackgroundCommand() && this.endpoint) {
             this.startHeartbeatLoop();
         }
     }
+    hasActiveInternalBackgroundCommand() {
+        for (const command of this.activeBackgroundCommands.values()) {
+            if (command.routeKind === "internal") {
+                return true;
+            }
+        }
+        return false;
+    }
     async startExec(command, options) {
-        const endpoint = this.resolveRuntimeEndpoint();
+        const route = this.resolveDataPlaneRoute();
         const body = JSON.stringify({ command, ...this.resolveExecOptions(options) });
         for (let attempt = 1; attempt <= this.execStartMaxAttempts; attempt += 1) {
             try {
-                const res = await this.fetchExecStart(`${endpoint}/exec`, {
+                const res = await this.fetchExecStart(commandStreamUrl(route), {
                     method: "POST",
                     headers: this.jsonHeaders(),
                     body,
@@ -615,15 +651,38 @@ export class LazySandbox {
         }
         this.resetSessionState(sessionId);
     }
-    resolveRuntimeEndpoint() {
-        const endpoint = this.requireEndpoint();
-        const sessionId = this.requireSessionId();
-        return this.resolveRuntimeEndpointFor(endpoint, sessionId);
-    }
     resolveRuntimeEndpointFor(endpoint, sessionId) {
         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);
+        if (normalizeDataPlaneBaseUrl(runtimeEndpoint) !== normalizeDataPlaneBaseUrl(endpoint)) {
+            return {
+                baseUrl: normalizeDataPlaneBaseUrl(runtimeEndpoint),
+                kind: "internal",
+            };
+        }
+        return {
+            baseUrl: sandboxSessionRoute(this.apiUrl, sessionId),
+            kind: "proxy",
+        };
+    }
     requireSessionId() {
         if (!this.sessionId) {
             throw new Error("Sandbox session unavailable");
@@ -643,6 +702,12 @@ export class LazySandbox {
 function isRetryableExecStartStatus(status) {
     return status === 502 || status === 503 || status === 504;
 }
+function commandStreamUrl(route) {
+    return `${route.baseUrl}${route.kind === "internal" ? "/exec" : "/commands/stream"}`;
+}
+function backgroundCommandsUrl(route) {
+    return `${route.baseUrl}${route.kind === "internal" ? "/exec/commands" : "/commands"}`;
+}
 /**
  * Heuristic: Deno's fetch throws an `Error` with message "fetch failed" (case-
  * insensitive) when the TCP connection is refused or the host is unreachable.

package/esm/src/sandbox/proxy-routes.d.ts

@@ -0,0 +1,3 @@
+export declare function sandboxSessionRoute(apiUrl: string, sessionId: string, path?: string): string;
+export declare function readSandboxFileContent(res: Response): Promise<string>;
+//# sourceMappingURL=proxy-routes.d.ts.map

package/esm/src/sandbox/proxy-routes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy-routes.d.ts","sourceRoot":"","sources":["../../../src/src/sandbox/proxy-routes.ts"],"names":[],"mappings":"AAEA,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,IAAI,SAAK,GACR,MAAM,CAGR;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAwB3E"}

package/esm/src/sandbox/proxy-routes.js

@@ -0,0 +1,28 @@
+import { REQUEST_ERROR } from "../errors/index.js";
+export function sandboxSessionRoute(apiUrl, sessionId, path = "") {
+    const base = `${apiUrl.replace(/\/+$/, "")}/sandbox-sessions/${encodeURIComponent(sessionId)}`;
+    return path ? `${base}${path}` : base;
+}
+export async function readSandboxFileContent(res) {
+    const contentType = res.headers.get("Content-Type") ?? "";
+    if (!contentType.toLowerCase().includes("application/json")) {
+        return await res.text();
+    }
+    let json;
+    try {
+        json = await res.json();
+    }
+    catch (cause) {
+        throw REQUEST_ERROR.create({
+            detail: "Sandbox file response is not valid JSON",
+            cause,
+        });
+    }
+    const content = json && typeof json === "object"
+        ? json.content
+        : undefined;
+    if (typeof content !== "string") {
+        throw REQUEST_ERROR.create({ detail: "Sandbox file response missing content" });
+    }
+    return content;
+}

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

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

package/esm/src/sandbox/sandbox.js

@@ -9,6 +9,7 @@
 import { INITIALIZATION_ERROR, REQUEST_ERROR, TIMEOUT_ERROR } from "../errors/index.js";
 import { LazySandbox } from "./lazy-sandbox.js";
 import { resolveSandboxApiUrl, resolveSandboxAuthToken } from "./config.js";
+import { readSandboxFileContent, sandboxSessionRoute } from "./proxy-routes.js";
 export { resolveSandboxApiUrl, resolveSandboxAuthToken } from "./config.js";
 /** Client for isolated ephemeral compute environments with command execution and file I/O. */
 export class Sandbox {
@@ -138,7 +139,7 @@ export class Sandbox {
     }
     /** Execute a bash command with streaming output (NDJSON). */
     async *executeStream(command, options) {
-        const res = await fetch(`${this.endpoint}/exec`, {
+        const res = await fetch(sandboxSessionRoute(this.apiUrl, this.sessionId, "/commands/stream"), {
             method: "POST",
             headers: {
                 Authorization: `Bearer ${this.authToken}`,
@@ -155,47 +156,59 @@ export class Sandbox {
         const reader = res.body.getReader();
         const decoder = new TextDecoder();
         let buffer = "";
-        while (true) {
-            const { done, value } = await reader.read();
-            if (done)
-                break;
-            buffer += decoder.decode(value, { stream: true });
-            const lines = buffer.split("\n");
-            buffer = lines.pop();
-            for (const line of lines) {
-                if (line.trim()) {
-                    try {
-                        yield JSON.parse(line);
-                    }
-                    catch {
-                        // Malformed NDJSON line (e.g. truncated network chunk); skip and
-                        // continue streaming so already-buffered output is not lost.
+        let completed = false;
+        try {
+            while (true) {
+                const { done, value } = await reader.read();
+                if (done) {
+                    completed = true;
+                    break;
+                }
+                buffer += decoder.decode(value, { stream: true });
+                const lines = buffer.split("\n");
+                buffer = lines.pop();
+                for (const line of lines) {
+                    if (line.trim()) {
+                        try {
+                            yield JSON.parse(line);
+                        }
+                        catch {
+                            // Malformed NDJSON line (e.g. truncated network chunk); skip and
+                            // continue streaming so already-buffered output is not lost.
+                        }
                     }
                 }
             }
-        }
-        if (buffer.trim()) {
-            try {
-                yield JSON.parse(buffer);
+            buffer += decoder.decode();
+            if (buffer.trim()) {
+                try {
+                    yield JSON.parse(buffer);
+                }
+                catch {
+                    // Malformed final chunk; discard rather than surfacing a SyntaxError.
+                }
             }
-            catch {
-                // Malformed final chunk; discard rather than surfacing a SyntaxError.
+        }
+        finally {
+            if (!completed) {
+                await reader.cancel().catch(() => { });
             }
+            reader.releaseLock();
         }
     }
     /** Read a file from the sandbox workspace. */
     async readFile(path) {
-        const res = await fetch(`${this.endpoint}/file?path=${encodeURIComponent(path)}`, {
+        const res = await fetch(sandboxSessionRoute(this.apiUrl, this.sessionId, `/file?path=${encodeURIComponent(path)}`), {
             headers: { Authorization: `Bearer ${this.authToken}` },
         });
         if (!res.ok) {
             throw REQUEST_ERROR.create({ detail: `Read file failed: ${res.status} ${await res.text()}` });
         }
-        return res.text();
+        return await readSandboxFileContent(res);
     }
     /** Write files to the sandbox workspace. */
     async writeFiles(files) {
-        const res = await fetch(`${this.endpoint}/files`, {
+        const res = await fetch(sandboxSessionRoute(this.apiUrl, this.sessionId, "/files"), {
             method: "POST",
             headers: {
                 Authorization: `Bearer ${this.authToken}`,
@@ -211,7 +224,7 @@ export class Sandbox {
     }
     /** Start an async background command in the sandbox. */
     async startBackgroundCommand(command, options) {
-        const res = await fetch(`${this.endpoint}/exec/commands`, {
+        const res = await fetch(sandboxSessionRoute(this.apiUrl, this.sessionId, "/commands"), {
             method: "POST",
             headers: {
                 Authorization: `Bearer ${this.authToken}`,
@@ -228,7 +241,7 @@ export class Sandbox {
     }
     /** Get the status of an async background command. */
     async getBackgroundCommand(commandId) {
-        const res = await fetch(`${this.endpoint}/exec/commands/${encodeURIComponent(commandId)}`, {
+        const res = await fetch(sandboxSessionRoute(this.apiUrl, this.sessionId, `/commands/${encodeURIComponent(commandId)}`), {
             headers: { Authorization: `Bearer ${this.authToken}` },
         });
         if (!res.ok) {
@@ -240,7 +253,7 @@ export class Sandbox {
     }
     /** Get the output of an async background command. */
     async getBackgroundCommandOutput(commandId) {
-        const res = await fetch(`${this.endpoint}/exec/commands/${encodeURIComponent(commandId)}/output`, {
+        const res = await fetch(sandboxSessionRoute(this.apiUrl, this.sessionId, `/commands/${encodeURIComponent(commandId)}/output`), {
             headers: { Authorization: `Bearer ${this.authToken}` },
         });
         if (!res.ok) {
@@ -259,7 +272,7 @@ export class Sandbox {
     }
     /** List all background commands in the sandbox. */
     async listBackgroundCommands() {
-        const res = await fetch(`${this.endpoint}/exec/commands`, {
+        const res = await fetch(sandboxSessionRoute(this.apiUrl, this.sessionId, "/commands"), {
             headers: { Authorization: `Bearer ${this.authToken}` },
         });
         if (!res.ok) {
@@ -273,7 +286,7 @@ export class Sandbox {
     }
     /** Cancel an async background command. */
     async cancelBackgroundCommand(commandId) {
-        const res = await fetch(`${this.endpoint}/exec/commands/${encodeURIComponent(commandId)}/cancel`, {
+        const res = await fetch(sandboxSessionRoute(this.apiUrl, this.sessionId, `/commands/${encodeURIComponent(commandId)}/cancel`), {
             method: "POST",
             headers: { Authorization: `Bearer ${this.authToken}` },
         });

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"}