@gcoredev/fastedge-test 0.2.1 → 0.2.3

package/bin/fastedge-debug.js

@@ -34,8 +34,43 @@ function resolveAppRoot(startPath) {
   return dir;
 }
 
-process.env.WORKSPACE_PATH = resolveAppRoot(
-  process.argv[2] ? resolve(process.argv[2]) : process.cwd()
-);
+// Parse `--project-dir <path>` / `--project-dir=<path>` and strip it from argv
+// before the server import, so the server's own arg handling doesn't see it.
+// When set, it overrides the positional fallback for resolveAppRoot — useful
+// when running from a nested sandbox (e.g. `cd fastedge-test && npm run debug`
+// with the project root one directory up).
+function extractProjectDirFlag(argv) {
+  for (let i = 2; i < argv.length; i++) {
+    const a = argv[i];
+    if (a === "--project-dir" || a === "-C") {
+      const value = argv[i + 1];
+      if (!value) {
+        console.error(`Error: ${a} requires a path argument.`);
+        process.exit(2);
+      }
+      argv.splice(i, 2);
+      return value;
+    }
+    const eq = a.startsWith("--project-dir=")
+      ? a.slice("--project-dir=".length)
+      : a.startsWith("-C=")
+        ? a.slice("-C=".length)
+        : null;
+    if (eq !== null) {
+      argv.splice(i, 1);
+      return eq;
+    }
+  }
+  return null;
+}
+
+const projectDirFlag = extractProjectDirFlag(process.argv);
+const startPath = projectDirFlag
+  ? resolve(projectDirFlag)
+  : process.argv[2]
+    ? resolve(process.argv[2])
+    : process.cwd();
+
+process.env.WORKSPACE_PATH = resolveAppRoot(startPath);
 
 import("../dist/server.js");

package/dist/fastedge-cli/METADATA.json

@@ -1 +1 @@
-{"fastedge_run_version": "v0.16.5"}
+{"fastedge_run_version": "v0.16.7"}

package/dist/lib/index.cjs

@@ -927,7 +927,13 @@ var HostFunctions = class {
   pendingHttpCall = null;
   httpCallResponse = null;
   streamClosed = false;
-  // Local response state (from proxy_send_local_response / send_http_response)
+  // Local response state (from proxy_send_local_response / send_http_response).
+  // `headers` carries the additional headers passed as the 4th argument of
+  // `send_http_response`; ProxyWasmRunner merges these into finalResponse at
+  // the short-circuit points so they reach the caller alongside any headers
+  // accumulated via stream_context.headers.response.add() in the same hook.
+  // Stored as tuples to preserve order and duplicate-name semantics (e.g. for
+  // multi-value Set-Cookie additions).
   localResponse = null;
   // FastEdge extensions
   secretStore;
@@ -1277,12 +1283,13 @@ var HostFunctions = class {
         );
         const statusText = this.memory.readString(statusCodePtr, statusCodeLen);
         const body = this.memory.readBytes(bodyPtr, bodyLen);
+        let headers = [];
         if (headerPairsLen > 0) {
           const headerBytes = this.memory.readBytes(headerPairsPtr, headerPairsLen);
-          const headers = HeaderManager.deserializeBinary(headerBytes);
-          this.logDebug(`send_local_response headers (not merged): ${JSON.stringify(headers)}`);
+          headers = HeaderManager.deserializeBinaryToTuples(headerBytes);
+          this.logDebug(`send_local_response headers: ${JSON.stringify(headers)}`);
         }
-        this.localResponse = { statusCode, statusText, body };
+        this.localResponse = { statusCode, statusText, body, headers };
         this.logs.push({
           level: 1,
           message: `local_response status=${statusCode} ${statusText} bodyLen=${body.byteLength} grpc=${grpcStatus}`
@@ -2076,14 +2083,15 @@ var ProxyWasmRunner = class {
       const local = this.hostFunctions.getLocalResponse();
       const responseHeaders2 = results.onRequestHeaders.output.response.headers;
       this.hostFunctions.resetLocalResponse();
-      const contentType2 = HeaderManager.firstValue(responseHeaders2["content-type"]) || "text/plain";
+      const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+      const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
       const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
       return {
         hookResults: results,
         finalResponse: {
           status: local.statusCode,
           statusText: local.statusText,
-          headers: responseHeaders2,
+          headers: mergedHeaders,
           body,
           contentType: contentType2,
           isBase64: isBase642
@@ -2119,14 +2127,15 @@ var ProxyWasmRunner = class {
       const local = this.hostFunctions.getLocalResponse();
       const responseHeaders2 = results.onRequestBody.output.response.headers;
       this.hostFunctions.resetLocalResponse();
-      const contentType2 = HeaderManager.firstValue(responseHeaders2["content-type"]) || "text/plain";
+      const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+      const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
       const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
       return {
         hookResults: results,
         finalResponse: {
           status: local.statusCode,
           statusText: local.statusText,
-          headers: responseHeaders2,
+          headers: mergedHeaders,
           body,
           contentType: contentType2,
           isBase64: isBase642
@@ -2296,16 +2305,17 @@ var ProxyWasmRunner = class {
       }
       if (results.onResponseHeaders.returnCode === 1 && this.hostFunctions.hasLocalResponse()) {
         const local = this.hostFunctions.getLocalResponse();
-        const headers = results.onResponseHeaders.output.response.headers;
+        const responseHeaders2 = results.onResponseHeaders.output.response.headers;
         this.hostFunctions.resetLocalResponse();
-        const contentType2 = HeaderManager.firstValue(headers["content-type"]) || "text/plain";
+        const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+        const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
         const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
         return {
           hookResults: results,
           finalResponse: {
             status: local.statusCode,
             statusText: local.statusText,
-            headers,
+            headers: mergedHeaders,
             body,
             contentType: contentType2,
             isBase64: isBase642
@@ -2339,16 +2349,17 @@ var ProxyWasmRunner = class {
       }
       if (results.onResponseBody.returnCode === 1 && this.hostFunctions.hasLocalResponse()) {
         const local = this.hostFunctions.getLocalResponse();
-        const headers = results.onResponseBody.output.response.headers;
+        const responseHeaders2 = results.onResponseBody.output.response.headers;
         this.hostFunctions.resetLocalResponse();
-        const contentType2 = HeaderManager.firstValue(headers["content-type"]) || "text/plain";
+        const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+        const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
         const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
         return {
           hookResults: results,
           finalResponse: {
             status: local.statusCode,
             statusText: local.statusText,
-            headers,
+            headers: mergedHeaders,
             body,
             contentType: contentType2,
             isBase64: isBase642
@@ -2723,7 +2734,9 @@ var ProxyWasmRunner = class {
     }
   }
   createImports() {
-    const wasi = new import_node_wasi.WASI({ version: "preview1", env: this.dictionary.getAll() });
+    const dictEnv = this.dictionary.getAll();
+    const wasiEnv = Object.keys(dictEnv).length === 0 ? { __FASTEDGE_RUNNER__: "1" } : dictEnv;
+    const wasi = new import_node_wasi.WASI({ version: "preview1", env: wasiEnv });
     const wasiImport = wasi.wasiImport;
     return {
       env: this.hostFunctions.createImports(),
@@ -2897,19 +2910,37 @@ function getCliBinaryName() {
       throw new Error(`Unsupported platform: ${import_os.default.platform()}`);
   }
 }
-function getBundledCliPaths() {
+function getPackageRoot(startDir = _currentDir) {
+  let dir = startDir;
+  while (true) {
+    const pkgPath = (0, import_path2.join)(dir, "package.json");
+    if ((0, import_fs.existsSync)(pkgPath)) {
+      try {
+        const pkg = JSON.parse((0, import_fs.readFileSync)(pkgPath, "utf8"));
+        if (pkg.name === "@gcoredev/fastedge-test") return dir;
+      } catch {
+      }
+    }
+    const parent = (0, import_path2.dirname)(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+function getBundledCliPaths(startDir = _currentDir) {
   const binaryName = getCliBinaryName();
-  return [
-    // Installed npm package: dist/lib/index.js → dist/fastedge-cli/
-    (0, import_path2.join)(_currentDir, "..", "fastedge-cli", binaryName),
-    // Production: bundled server at dist/server.js → dist/fastedge-cli/
-    (0, import_path2.join)(_currentDir, "fastedge-cli", binaryName),
-    // Development/Tests: running from source
-    // _currentDir might be server/utils/, so go up to project root
-    (0, import_path2.join)(_currentDir, "..", "..", "fastedge-run", binaryName),
-    // Alternative: if _currentDir is already at project root
-    (0, import_path2.join)(_currentDir, "fastedge-run", binaryName)
-  ];
+  const candidates = [];
+  const root = getPackageRoot(startDir);
+  if (root) {
+    candidates.push(
+      (0, import_path2.join)(root, "dist", "fastedge-cli", binaryName),
+      (0, import_path2.join)(root, "fastedge-run", binaryName)
+    );
+  }
+  candidates.push(
+    (0, import_path2.join)(startDir, "fastedge-cli", binaryName),
+    (0, import_path2.join)(startDir, "..", "fastedge-cli", binaryName)
+  );
+  return candidates;
 }
 function ensureExecutable(binaryPath) {
   if (process.platform !== "win32") {
@@ -2947,7 +2978,7 @@ async function findFastEdgeRunCli() {
   } catch (error) {
   }
   throw new Error(
-    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled binary in fastedge-cli/ (project root)\n  3. System PATH\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH environment variable, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Place the binary in fastedge-cli/ at project root (platform-specific filename)"
+    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled inside the @gcoredev/fastedge-test package (dist/fastedge-cli/<binary> when installed, fastedge-run/<binary> in the source tree)\n  3. System PATH (which/where fastedge-run)\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH to a fastedge-run binary you have locally, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Reinstall @gcoredev/fastedge-test to restore the bundled binary (or, when developing this repo, place the platform binary in fastedge-run/)"
   );
 }
 

package/dist/lib/index.js

@@ -1,3 +1,5 @@
+import { createRequire as __cr } from 'node:module'; const require = __cr(import.meta.url);
+
 // server/runner/ProxyWasmRunner.ts
 import { WASI } from "node:wasi";
 
@@ -883,7 +885,13 @@ var HostFunctions = class {
   pendingHttpCall = null;
   httpCallResponse = null;
   streamClosed = false;
-  // Local response state (from proxy_send_local_response / send_http_response)
+  // Local response state (from proxy_send_local_response / send_http_response).
+  // `headers` carries the additional headers passed as the 4th argument of
+  // `send_http_response`; ProxyWasmRunner merges these into finalResponse at
+  // the short-circuit points so they reach the caller alongside any headers
+  // accumulated via stream_context.headers.response.add() in the same hook.
+  // Stored as tuples to preserve order and duplicate-name semantics (e.g. for
+  // multi-value Set-Cookie additions).
   localResponse = null;
   // FastEdge extensions
   secretStore;
@@ -1233,12 +1241,13 @@ var HostFunctions = class {
         );
         const statusText = this.memory.readString(statusCodePtr, statusCodeLen);
         const body = this.memory.readBytes(bodyPtr, bodyLen);
+        let headers = [];
         if (headerPairsLen > 0) {
           const headerBytes = this.memory.readBytes(headerPairsPtr, headerPairsLen);
-          const headers = HeaderManager.deserializeBinary(headerBytes);
-          this.logDebug(`send_local_response headers (not merged): ${JSON.stringify(headers)}`);
+          headers = HeaderManager.deserializeBinaryToTuples(headerBytes);
+          this.logDebug(`send_local_response headers: ${JSON.stringify(headers)}`);
         }
-        this.localResponse = { statusCode, statusText, body };
+        this.localResponse = { statusCode, statusText, body, headers };
         this.logs.push({
           level: 1,
           message: `local_response status=${statusCode} ${statusText} bodyLen=${body.byteLength} grpc=${grpcStatus}`
@@ -2032,14 +2041,15 @@ var ProxyWasmRunner = class {
       const local = this.hostFunctions.getLocalResponse();
       const responseHeaders2 = results.onRequestHeaders.output.response.headers;
       this.hostFunctions.resetLocalResponse();
-      const contentType2 = HeaderManager.firstValue(responseHeaders2["content-type"]) || "text/plain";
+      const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+      const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
       const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
       return {
         hookResults: results,
         finalResponse: {
           status: local.statusCode,
           statusText: local.statusText,
-          headers: responseHeaders2,
+          headers: mergedHeaders,
           body,
           contentType: contentType2,
           isBase64: isBase642
@@ -2075,14 +2085,15 @@ var ProxyWasmRunner = class {
       const local = this.hostFunctions.getLocalResponse();
       const responseHeaders2 = results.onRequestBody.output.response.headers;
       this.hostFunctions.resetLocalResponse();
-      const contentType2 = HeaderManager.firstValue(responseHeaders2["content-type"]) || "text/plain";
+      const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+      const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
       const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
       return {
         hookResults: results,
         finalResponse: {
           status: local.statusCode,
           statusText: local.statusText,
-          headers: responseHeaders2,
+          headers: mergedHeaders,
           body,
           contentType: contentType2,
           isBase64: isBase642
@@ -2252,16 +2263,17 @@ var ProxyWasmRunner = class {
       }
       if (results.onResponseHeaders.returnCode === 1 && this.hostFunctions.hasLocalResponse()) {
         const local = this.hostFunctions.getLocalResponse();
-        const headers = results.onResponseHeaders.output.response.headers;
+        const responseHeaders2 = results.onResponseHeaders.output.response.headers;
         this.hostFunctions.resetLocalResponse();
-        const contentType2 = HeaderManager.firstValue(headers["content-type"]) || "text/plain";
+        const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+        const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
         const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
         return {
           hookResults: results,
           finalResponse: {
             status: local.statusCode,
             statusText: local.statusText,
-            headers,
+            headers: mergedHeaders,
             body,
             contentType: contentType2,
             isBase64: isBase642
@@ -2295,16 +2307,17 @@ var ProxyWasmRunner = class {
       }
       if (results.onResponseBody.returnCode === 1 && this.hostFunctions.hasLocalResponse()) {
         const local = this.hostFunctions.getLocalResponse();
-        const headers = results.onResponseBody.output.response.headers;
+        const responseHeaders2 = results.onResponseBody.output.response.headers;
         this.hostFunctions.resetLocalResponse();
-        const contentType2 = HeaderManager.firstValue(headers["content-type"]) || "text/plain";
+        const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+        const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
         const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
         return {
           hookResults: results,
           finalResponse: {
             status: local.statusCode,
             statusText: local.statusText,
-            headers,
+            headers: mergedHeaders,
             body,
             contentType: contentType2,
             isBase64: isBase642
@@ -2679,7 +2692,9 @@ var ProxyWasmRunner = class {
     }
   }
   createImports() {
-    const wasi = new WASI({ version: "preview1", env: this.dictionary.getAll() });
+    const dictEnv = this.dictionary.getAll();
+    const wasiEnv = Object.keys(dictEnv).length === 0 ? { __FASTEDGE_RUNNER__: "1" } : dictEnv;
+    const wasi = new WASI({ version: "preview1", env: wasiEnv });
     const wasiImport = wasi.wasiImport;
     return {
       env: this.hostFunctions.createImports(),
@@ -2836,7 +2851,7 @@ import { spawn, execSync as execSync2 } from "child_process";
 
 // server/utils/fastedge-cli.ts
 import { execSync } from "child_process";
-import { existsSync, chmodSync } from "fs";
+import { existsSync, chmodSync, readFileSync } from "fs";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import os from "os";
@@ -2853,19 +2868,37 @@ function getCliBinaryName() {
       throw new Error(`Unsupported platform: ${os.platform()}`);
   }
 }
-function getBundledCliPaths() {
+function getPackageRoot(startDir = _currentDir) {
+  let dir = startDir;
+  while (true) {
+    const pkgPath = join(dir, "package.json");
+    if (existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
+        if (pkg.name === "@gcoredev/fastedge-test") return dir;
+      } catch {
+      }
+    }
+    const parent = dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+function getBundledCliPaths(startDir = _currentDir) {
   const binaryName = getCliBinaryName();
-  return [
-    // Installed npm package: dist/lib/index.js → dist/fastedge-cli/
-    join(_currentDir, "..", "fastedge-cli", binaryName),
-    // Production: bundled server at dist/server.js → dist/fastedge-cli/
-    join(_currentDir, "fastedge-cli", binaryName),
-    // Development/Tests: running from source
-    // _currentDir might be server/utils/, so go up to project root
-    join(_currentDir, "..", "..", "fastedge-run", binaryName),
-    // Alternative: if _currentDir is already at project root
-    join(_currentDir, "fastedge-run", binaryName)
-  ];
+  const candidates = [];
+  const root = getPackageRoot(startDir);
+  if (root) {
+    candidates.push(
+      join(root, "dist", "fastedge-cli", binaryName),
+      join(root, "fastedge-run", binaryName)
+    );
+  }
+  candidates.push(
+    join(startDir, "fastedge-cli", binaryName),
+    join(startDir, "..", "fastedge-cli", binaryName)
+  );
+  return candidates;
 }
 function ensureExecutable(binaryPath) {
   if (process.platform !== "win32") {
@@ -2903,7 +2936,7 @@ async function findFastEdgeRunCli() {
   } catch (error) {
   }
   throw new Error(
-    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled binary in fastedge-cli/ (project root)\n  3. System PATH\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH environment variable, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Place the binary in fastedge-cli/ at project root (platform-specific filename)"
+    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled inside the @gcoredev/fastedge-test package (dist/fastedge-cli/<binary> when installed, fastedge-run/<binary> in the source tree)\n  3. System PATH (which/where fastedge-run)\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH to a fastedge-run binary you have locally, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Reinstall @gcoredev/fastedge-test to restore the bundled binary (or, when developing this repo, place the platform binary in fastedge-run/)"
   );
 }
 

package/dist/lib/runner/HostFunctions.d.ts

@@ -59,6 +59,7 @@ export declare class HostFunctions {
         statusCode: number;
         statusText: string;
         body: Uint8Array;
+        headers: HeaderTuples;
     } | null;
     resetLocalResponse(): void;
     getRequestHeaders(): HeaderRecord;

package/dist/lib/test-framework/index.cjs

@@ -19324,7 +19324,13 @@ var HostFunctions = class {
   pendingHttpCall = null;
   httpCallResponse = null;
   streamClosed = false;
-  // Local response state (from proxy_send_local_response / send_http_response)
+  // Local response state (from proxy_send_local_response / send_http_response).
+  // `headers` carries the additional headers passed as the 4th argument of
+  // `send_http_response`; ProxyWasmRunner merges these into finalResponse at
+  // the short-circuit points so they reach the caller alongside any headers
+  // accumulated via stream_context.headers.response.add() in the same hook.
+  // Stored as tuples to preserve order and duplicate-name semantics (e.g. for
+  // multi-value Set-Cookie additions).
   localResponse = null;
   // FastEdge extensions
   secretStore;
@@ -19674,12 +19680,13 @@ var HostFunctions = class {
         );
         const statusText = this.memory.readString(statusCodePtr, statusCodeLen);
         const body = this.memory.readBytes(bodyPtr, bodyLen);
+        let headers = [];
         if (headerPairsLen > 0) {
           const headerBytes = this.memory.readBytes(headerPairsPtr, headerPairsLen);
-          const headers = HeaderManager.deserializeBinary(headerBytes);
-          this.logDebug(`send_local_response headers (not merged): ${JSON.stringify(headers)}`);
+          headers = HeaderManager.deserializeBinaryToTuples(headerBytes);
+          this.logDebug(`send_local_response headers: ${JSON.stringify(headers)}`);
         }
-        this.localResponse = { statusCode, statusText, body };
+        this.localResponse = { statusCode, statusText, body, headers };
         this.logs.push({
           level: 1,
           message: `local_response status=${statusCode} ${statusText} bodyLen=${body.byteLength} grpc=${grpcStatus}`
@@ -20473,14 +20480,15 @@ var ProxyWasmRunner = class {
       const local = this.hostFunctions.getLocalResponse();
       const responseHeaders2 = results.onRequestHeaders.output.response.headers;
       this.hostFunctions.resetLocalResponse();
-      const contentType2 = HeaderManager.firstValue(responseHeaders2["content-type"]) || "text/plain";
+      const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+      const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
       const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
       return {
         hookResults: results,
         finalResponse: {
           status: local.statusCode,
           statusText: local.statusText,
-          headers: responseHeaders2,
+          headers: mergedHeaders,
           body,
           contentType: contentType2,
           isBase64: isBase642
@@ -20516,14 +20524,15 @@ var ProxyWasmRunner = class {
       const local = this.hostFunctions.getLocalResponse();
       const responseHeaders2 = results.onRequestBody.output.response.headers;
       this.hostFunctions.resetLocalResponse();
-      const contentType2 = HeaderManager.firstValue(responseHeaders2["content-type"]) || "text/plain";
+      const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+      const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
       const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
       return {
         hookResults: results,
         finalResponse: {
           status: local.statusCode,
           statusText: local.statusText,
-          headers: responseHeaders2,
+          headers: mergedHeaders,
           body,
           contentType: contentType2,
           isBase64: isBase642
@@ -20693,16 +20702,17 @@ var ProxyWasmRunner = class {
       }
       if (results.onResponseHeaders.returnCode === 1 && this.hostFunctions.hasLocalResponse()) {
         const local = this.hostFunctions.getLocalResponse();
-        const headers = results.onResponseHeaders.output.response.headers;
+        const responseHeaders2 = results.onResponseHeaders.output.response.headers;
         this.hostFunctions.resetLocalResponse();
-        const contentType2 = HeaderManager.firstValue(headers["content-type"]) || "text/plain";
+        const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+        const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
         const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
         return {
           hookResults: results,
           finalResponse: {
             status: local.statusCode,
             statusText: local.statusText,
-            headers,
+            headers: mergedHeaders,
             body,
             contentType: contentType2,
             isBase64: isBase642
@@ -20736,16 +20746,17 @@ var ProxyWasmRunner = class {
       }
       if (results.onResponseBody.returnCode === 1 && this.hostFunctions.hasLocalResponse()) {
         const local = this.hostFunctions.getLocalResponse();
-        const headers = results.onResponseBody.output.response.headers;
+        const responseHeaders2 = results.onResponseBody.output.response.headers;
         this.hostFunctions.resetLocalResponse();
-        const contentType2 = HeaderManager.firstValue(headers["content-type"]) || "text/plain";
+        const mergedHeaders = local.headers.length > 0 ? HeaderManager.appendMerge(responseHeaders2, HeaderManager.tuplesToRecord(local.headers)) : responseHeaders2;
+        const contentType2 = HeaderManager.firstValue(mergedHeaders["content-type"]) || "text/plain";
         const { body, isBase64: isBase642 } = encodeLocalResponseBody(local.body, contentType2);
         return {
           hookResults: results,
           finalResponse: {
             status: local.statusCode,
             statusText: local.statusText,
-            headers,
+            headers: mergedHeaders,
             body,
             contentType: contentType2,
             isBase64: isBase642
@@ -21120,7 +21131,9 @@ var ProxyWasmRunner = class {
     }
   }
   createImports() {
-    const wasi = new import_node_wasi.WASI({ version: "preview1", env: this.dictionary.getAll() });
+    const dictEnv = this.dictionary.getAll();
+    const wasiEnv = Object.keys(dictEnv).length === 0 ? { __FASTEDGE_RUNNER__: "1" } : dictEnv;
+    const wasi = new import_node_wasi.WASI({ version: "preview1", env: wasiEnv });
     const wasiImport = wasi.wasiImport;
     return {
       env: this.hostFunctions.createImports(),
@@ -21294,19 +21307,37 @@ function getCliBinaryName() {
       throw new Error(`Unsupported platform: ${import_os.default.platform()}`);
   }
 }
-function getBundledCliPaths() {
+function getPackageRoot(startDir = _currentDir) {
+  let dir = startDir;
+  while (true) {
+    const pkgPath = (0, import_path2.join)(dir, "package.json");
+    if ((0, import_fs.existsSync)(pkgPath)) {
+      try {
+        const pkg = JSON.parse((0, import_fs.readFileSync)(pkgPath, "utf8"));
+        if (pkg.name === "@gcoredev/fastedge-test") return dir;
+      } catch {
+      }
+    }
+    const parent = (0, import_path2.dirname)(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+function getBundledCliPaths(startDir = _currentDir) {
   const binaryName = getCliBinaryName();
-  return [
-    // Installed npm package: dist/lib/index.js → dist/fastedge-cli/
-    (0, import_path2.join)(_currentDir, "..", "fastedge-cli", binaryName),
-    // Production: bundled server at dist/server.js → dist/fastedge-cli/
-    (0, import_path2.join)(_currentDir, "fastedge-cli", binaryName),
-    // Development/Tests: running from source
-    // _currentDir might be server/utils/, so go up to project root
-    (0, import_path2.join)(_currentDir, "..", "..", "fastedge-run", binaryName),
-    // Alternative: if _currentDir is already at project root
-    (0, import_path2.join)(_currentDir, "fastedge-run", binaryName)
-  ];
+  const candidates = [];
+  const root = getPackageRoot(startDir);
+  if (root) {
+    candidates.push(
+      (0, import_path2.join)(root, "dist", "fastedge-cli", binaryName),
+      (0, import_path2.join)(root, "fastedge-run", binaryName)
+    );
+  }
+  candidates.push(
+    (0, import_path2.join)(startDir, "fastedge-cli", binaryName),
+    (0, import_path2.join)(startDir, "..", "fastedge-cli", binaryName)
+  );
+  return candidates;
 }
 function ensureExecutable(binaryPath) {
   if (process.platform !== "win32") {
@@ -21344,7 +21375,7 @@ async function findFastEdgeRunCli() {
   } catch (error) {
   }
   throw new Error(
-    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled binary in fastedge-cli/ (project root)\n  3. System PATH\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH environment variable, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Place the binary in fastedge-cli/ at project root (platform-specific filename)"
+    "fastedge-run CLI not found in any of these locations:\n  1. FASTEDGE_RUN_PATH environment variable\n  2. Bundled inside the @gcoredev/fastedge-test package (dist/fastedge-cli/<binary> when installed, fastedge-run/<binary> in the source tree)\n  3. System PATH (which/where fastedge-run)\n\nTo fix this:\n  - Set FASTEDGE_RUN_PATH to a fastedge-run binary you have locally, or\n  - Install fastedge-run in PATH: cargo install fastedge-run, or\n  - Reinstall @gcoredev/fastedge-test to restore the bundled binary (or, when developing this repo, place the platform binary in fastedge-run/)"
   );
 }