@awsless/cli 0.0.46-next.20 → 0.0.46-next.22

package/dist/bin.js

@@ -53724,9 +53724,9 @@ var require_nodefs_handler = __commonJS((exports, module) => {
       if (this.fsw.closed) {
         return;
       }
-      const dirname17 = sysPath.dirname(file2);
+      const dirname18 = sysPath.dirname(file2);
       const basename4 = sysPath.basename(file2);
-      const parent = this.fsw._getWatchedDir(dirname17);
+      const parent = this.fsw._getWatchedDir(dirname18);
       let prevStats = stats2;
       if (parent.has(basename4))
         return;
@@ -53751,7 +53751,7 @@ var require_nodefs_handler = __commonJS((exports, module) => {
               prevStats = newStats2;
             }
           } catch (error3) {
-            this.fsw._remove(dirname17, basename4);
+            this.fsw._remove(dirname18, basename4);
           }
         } else if (parent.has(basename4)) {
           const at = newStats.atimeMs;
@@ -56327,7 +56327,7 @@ var require_client2 = __commonJS((exports) => {
 // ../../node_modules/.pnpm/@smithy+core@3.29.7/node_modules/@smithy/core/dist-cjs/submodules/config/index.js
 var require_config = __commonJS((exports) => {
   var { homedir: homedir2 } = __require("os");
-  var { sep: sep2, join: join29 } = __require("path");
+  var { sep: sep2, join: join30 } = __require("path");
   var { createHash: createHash17 } = __require("crypto");
   var { readFile: readFile$1 } = __require("fs/promises");
   var { IniSectionType: IniSectionType2 } = require_dist_cjs();
@@ -56485,7 +56485,7 @@ var require_config = __commonJS((exports) => {
   var getSSOTokenFilepath = (id) => {
     const hasher = createHash17("sha1");
     const cacheName = hasher.update(id).digest("hex");
-    return join29(getHomeDir(), ".aws", "sso", "cache", `${cacheName}.json`);
+    return join30(getHomeDir(), ".aws", "sso", "cache", `${cacheName}.json`);
   };
   var tokenIntercept = {};
   var getSSOTokenFromFile = async (id) => {
@@ -56512,9 +56512,9 @@ var require_config = __commonJS((exports) => {
     ...data.default && { default: data.default }
   });
   var ENV_CONFIG_PATH = "AWS_CONFIG_FILE";
-  var getConfigFilepath = () => process.env[ENV_CONFIG_PATH] || join29(getHomeDir(), ".aws", "config");
+  var getConfigFilepath = () => process.env[ENV_CONFIG_PATH] || join30(getHomeDir(), ".aws", "config");
   var ENV_CREDENTIALS_PATH = "AWS_SHARED_CREDENTIALS_FILE";
-  var getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] || join29(getHomeDir(), ".aws", "credentials");
+  var getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] || join30(getHomeDir(), ".aws", "credentials");
   var prefixKeyRegex = /^([\w-]+)\s(["'])?([\w-@+.%:/]+)\2$/;
   var profileNameBlockList = ["__proto__", "profile __proto__"];
   var parseIni = (iniData) => {
@@ -56580,11 +56580,11 @@ var require_config = __commonJS((exports) => {
     const relativeHomeDirPrefix = "~/";
     let resolvedFilepath = filepath;
     if (filepath.startsWith(relativeHomeDirPrefix)) {
-      resolvedFilepath = join29(homeDir, filepath.slice(2));
+      resolvedFilepath = join30(homeDir, filepath.slice(2));
     }
     let resolvedConfigFilepath = configFilepath;
     if (configFilepath.startsWith(relativeHomeDirPrefix)) {
-      resolvedConfigFilepath = join29(homeDir, configFilepath.slice(2));
+      resolvedConfigFilepath = join30(homeDir, configFilepath.slice(2));
     }
     const parsedFiles = await Promise.all([
       readFile13(resolvedConfigFilepath, {
@@ -74177,7 +74177,7 @@ var require_signin = __commonJS((exports) => {
 import { createHash as createHash17, createPrivateKey, createPublicKey, sign } from "crypto";
 import { promises as fs3 } from "fs";
 import { homedir as homedir3 } from "os";
-import { dirname as dirname18, join as join32 } from "path";
+import { dirname as dirname19, join as join33 } from "path";
 var import_config24, import_protocols3, LoginCredentialsFetcher;
 var init_LoginCredentialsFetcher = __esm(() => {
   import_config24 = __toESM(require_config(), 1);
@@ -74329,17 +74329,17 @@ var init_LoginCredentialsFetcher = __esm(() => {
     }
     async saveToken(token) {
       const tokenFilePath = this.getTokenFilePath();
-      const directory = dirname18(tokenFilePath);
+      const directory = dirname19(tokenFilePath);
       try {
         await fs3.mkdir(directory, { recursive: true });
       } catch (error3) {}
       await fs3.writeFile(tokenFilePath, JSON.stringify(token, null, 2), "utf8");
     }
     getTokenFilePath() {
-      const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join32(homedir3(), ".aws", "login", "cache");
+      const directory = process.env.AWS_LOGIN_CACHE_DIRECTORY ?? join33(homedir3(), ".aws", "login", "cache");
       const loginSessionBytes = Buffer.from(this.loginSession, "utf8");
       const loginSessionSha256 = createHash17("sha256").update(loginSessionBytes).digest("hex");
-      return join32(directory, `${loginSessionSha256}.json`);
+      return join33(directory, `${loginSessionSha256}.json`);
     }
     derToRawSignature(derSignature) {
       let offset = 2;
@@ -100753,6 +100753,8 @@ var ReservedConcurrentExecutionsSchema = exports_external.number().int().min(0).
 var VPCSchema = exports_external.boolean().describe("Put the function inside your global VPC.");
 var DescriptionSchema = exports_external.string().describe("A description of the function.");
 var LayersSchema = exports_external.string().array().describe(`A list of function layers to add to the function's execution environment. Specify each layer by its name.`);
+var SandboxRouteKeySchema = exports_external.string().regex(/^[a-z0-9-]+:[a-z0-9-]+:[a-z0-9-]+$/i, 'Invalid route key. Use the "stack:type:name" format.');
+var SandboxSchema = exports_external.union([exports_external.boolean(), SandboxRouteKeySchema.array()]).describe('Block the function from invoking other lambdas. Pass a list of route keys like "my-stack:function:my-name" to allow only those routes through a private sandbox gateway.');
 var EnvironmentSchema = exports_external.record(exports_external.string(), exports_external.string()).optional().describe("Environment variable key-value pairs.");
 var ArchitectureSchema = exports_external.enum(["x86_64", "arm64"]).describe("The instruction set architecture that the function supports.");
 var RuntimeSchema = exports_external.enum(["nodejs18.x", "nodejs20.x", "nodejs22.x", "nodejs24.x"]).or(exports_external.literal("container")).or(exports_external.string()).describe("The identifier of the function's runtime.");
@@ -100825,7 +100827,8 @@ var StackFnSchema = exports_external.object({
   reserved: ReservedConcurrentExecutionsSchema.optional(),
   layers: LayersSchema.optional(),
   environment: EnvironmentSchema.optional(),
-  permissions: PermissionsSchema.optional()
+  permissions: PermissionsSchema.optional(),
+  sandbox: SandboxSchema.optional()
 }).strict();
 var StackFunctionSchema = exports_external.union([
   LocalFileSchema.transform((code) => ({
@@ -100848,7 +100851,7 @@ var FunctionDefaultSchema = exports_external.object({
   timeout: TimeoutSchema.default("15 minutes"),
   memorySize: MemorySizeSchema.default("1024 MB"),
   architecture: ArchitectureSchema.default("arm64"),
-  vpc: VPCSchema.default(true),
+  vpc: VPCSchema.default(false),
   ephemeralStorageSize: EphemeralStorageSizeSchema.default("512 MB"),
   reserved: ReservedConcurrentExecutionsSchema.optional(),
   layers: LayersSchema.optional(),
@@ -101697,7 +101700,7 @@ var SitesSchema = exports_external.record(ResourceIdSchema, exports_external.obj
     configs: exports_external.string().array().optional().describe("Define the config values for your build command.")
   }).optional().describe(`Specifies the build process for sites that need a build step.`),
   static: exports_external.union([LocalDirectorySchema, exports_external.boolean()]).optional().describe("Specifies the path to the static files directory. Additionally you can also pass `true` when you don't have local static files, but still want to make an S3 bucket."),
-  ssr: FunctionSchema.optional().describe("Specifies the file that will render the site on the server.")
+  ssr: StackFunctionSchema.optional().describe("Specifies the file that will render the site on the server.")
 })).optional().describe("Define the sites in your stack.");
 
 // src/feature/store/schema.ts
@@ -104531,10 +104534,12 @@ import { formatRouteEnvName } from "awsless";
 import { relative as relative3 } from "path";
 
 // src/feature/function/util.ts
-import { seconds as seconds4, toDays as toDays6, toSeconds as toSeconds4 } from "@awsless/duration";
+import { days as days8, seconds as seconds4, toDays as toDays6, toSeconds as toSeconds4 } from "@awsless/duration";
 import { generateFileHash as generateFileHash2 } from "@awsless/ts-file-cache";
 var import_deepmerge = __toESM(require_cjs2(), 1);
 import { createHash as createHash10 } from "crypto";
+import { dirname as dirname7, join as join12 } from "path";
+import { fileURLToPath as fileURLToPath4 } from "url";
 
 // src/feature/on-error-log/util.ts
 var filterPattern = `{${[
@@ -104550,7 +104555,6 @@ var filterPattern = `{${[
 var standaloneFields = [
   "runtime",
   "description",
-  "vpc",
   "log",
   "timeout",
   "memorySize",
@@ -104559,7 +104563,8 @@ var standaloneFields = [
   "reserved",
   "layers",
   "environment",
-  "permissions"
+  "permissions",
+  "sandbox"
 ];
 var isStandaloneFunction = (props) => {
   return standaloneFields.some((field) => typeof props[field] !== "undefined");
@@ -104646,10 +104651,13 @@ var createLambdaFunction = (ctx, id, local) => {
       statementDeps.add(dep);
     }
   };
-  addPermission(...props.permissions ?? []);
-  ctx.onPermission((statement) => {
-    addPermission(statement);
-  });
+  const sandboxed = typeof local.sandbox !== "undefined" && local.sandbox !== false;
+  addPermission(...(sandboxed ? local.permissions : props.permissions) ?? []);
+  if (!sandboxed) {
+    ctx.onPermission((statement) => {
+      addPermission(statement);
+    });
+  }
   const policy = new aws.iam.RolePolicy(group, "policy", {
     role: role.name,
     name: "lambda-policy",
@@ -104747,7 +104755,11 @@ var createLambdaFunction = (ctx, id, local) => {
   variables.REGION = ctx.appConfig.region;
   variables.STAGE = ctx.appConfig.stage ?? "default";
   variables.STACK = ctx.stackConfig.name;
-  variables.STANDALONE = "true";
+  if (sandboxed) {
+    variables.SANDBOX = "true";
+  } else {
+    variables.STANDALONE = "true";
+  }
   if (props.vpc) {
     variables.AWS_USE_DUALSTACK_ENDPOINT = "true";
   }
@@ -104760,6 +104772,33 @@ var createLambdaFunction = (ctx, id, local) => {
   ctx.onBind((name2, value) => {
     variables[name2] = value;
   });
+  if (Array.isArray(local.sandbox) && local.sandbox.length > 0) {
+    const bundle = ctx.shared.get("bundle", "main");
+    const distDir = dirname7(fileURLToPath4(import.meta.url));
+    const proxy = createPrebuildLambdaFunction(group, ctx, "function", `${id}-proxy`, {
+      bundleFile: join12(distDir, "/prebuild/sandbox-proxy/bundle.zip"),
+      bundleHash: join12(distDir, "/prebuild/sandbox-proxy/HASH"),
+      runtime: "nodejs24.x",
+      handler: "index.default",
+      timeout: ctx.appConfig.defaults.function.timeout,
+      log: {
+        format: "json",
+        level: "warn",
+        system: "warn",
+        retention: days8(3)
+      }
+    });
+    proxy.setEnvironment("SANDBOX_ROUTES", JSON.stringify(local.sandbox));
+    proxy.addPermission({
+      actions: ["lambda:InvokeFunction"],
+      resources: [bundle.alias.arn]
+    });
+    variables.SANDBOX_PROXY = proxy.name;
+    addPermission({
+      actions: ["lambda:InvokeFunction"],
+      resources: [proxy.lambda.arn]
+    });
+  }
   if (props.log.retention.value > 0n) {
     const logGroup = new aws.cloudwatch.LogGroup(group, "log", {
       name: `/aws/lambda/${name}`,
@@ -105089,8 +105128,8 @@ var functionFeature = defineFeature({
 
 // src/feature/on-error-log/index.ts
 import { formatRouteEnvName as formatRouteEnvName2 } from "awsless";
-import { dirname as dirname7, join as join12 } from "path";
-import { fileURLToPath as fileURLToPath4 } from "url";
+import { dirname as dirname8, join as join13 } from "path";
+import { fileURLToPath as fileURLToPath5 } from "url";
 var onErrorLogFeature = defineFeature({
   name: "on-error-log",
   onApp(ctx) {
@@ -105105,7 +105144,7 @@ var onErrorLogFeature = defineFeature({
     const consumerRoute = formatRouteKey("base", "on-error-log", "consumer");
     bundle.addHandler({
       routeKey: handlerRoute,
-      file: join12(dirname7(fileURLToPath4(import.meta.url)), "/handlers/on-error-log.js"),
+      file: join13(dirname8(fileURLToPath5(import.meta.url)), "/handlers/on-error-log.js"),
       exportName: "default"
     });
     bundle.addEnv(formatRouteEnvName2(handlerRoute, "CONSUMER"), consumerRoute);
@@ -105160,9 +105199,9 @@ var onErrorLogFeature = defineFeature({
 });
 
 // src/feature/on-failure/index.ts
-import { days as days8, toSeconds as toSeconds5 } from "@awsless/duration";
-import { dirname as dirname8, join as join13 } from "path";
-import { fileURLToPath as fileURLToPath5 } from "url";
+import { days as days9, toSeconds as toSeconds5 } from "@awsless/duration";
+import { dirname as dirname9, join as join14 } from "path";
+import { fileURLToPath as fileURLToPath6 } from "url";
 var onFailureFeature = defineFeature({
   name: "on-failure",
   onBefore(ctx) {
@@ -105173,7 +105212,7 @@ var onFailureFeature = defineFeature({
         resourceType: "on-failure",
         resourceName: "deadletter"
       }),
-      messageRetentionSeconds: toSeconds5(days8(14))
+      messageRetentionSeconds: toSeconds5(days9(14))
     });
     const bundleTimeout = toSeconds5(ctx.appConfig.defaults.function.timeout);
     const queue2 = new aws.sqs.Queue(group, "on-failure", {
@@ -105310,10 +105349,10 @@ var onFailureFeature = defineFeature({
     const bundle = ctx.shared.get("bundle", "main");
     const { group, bucket, queue: queue2 } = ctx.shared.get("on-failure", "resources");
     registerBundleFunction(ctx, formatRouteKey("base", "on-failure", "consumer"), props.consumer);
-    const distDir = dirname8(fileURLToPath5(import.meta.url));
+    const distDir = dirname9(fileURLToPath6(import.meta.url));
     const handler = createPrebuildLambdaFunction(group, ctx, "on-failure", "handler", {
-      bundleFile: join13(distDir, "/prebuild/on-failure/bundle.zip"),
-      bundleHash: join13(distDir, "/prebuild/on-failure/HASH"),
+      bundleFile: join14(distDir, "/prebuild/on-failure/bundle.zip"),
+      bundleHash: join14(distDir, "/prebuild/on-failure/HASH"),
       runtime: "nodejs24.x",
       handler: "index.default",
       memorySize: mebibytes(256),
@@ -105322,7 +105361,7 @@ var onFailureFeature = defineFeature({
         format: "json",
         level: "warn",
         system: "warn",
-        retention: days8(3)
+        retention: days9(3)
       }
     });
     handler.addPermission({
@@ -105387,8 +105426,8 @@ var onFailureFeature = defineFeature({
 
 // src/feature/pubsub/index.ts
 import { createHmac as createHmac2 } from "crypto";
-import { fileURLToPath as fileURLToPath7 } from "url";
-import { dirname as dirname10, join as join16 } from "path";
+import { fileURLToPath as fileURLToPath8 } from "url";
+import { dirname as dirname11, join as join17 } from "path";
 import { formatRouteEnvName as formatRouteEnvName3 } from "awsless";
 
 // src/feature/pubsub/util.ts
@@ -105396,15 +105435,15 @@ import { toDays as toDays7 } from "@awsless/duration";
 import { stringify } from "@awsless/json";
 import { createHash as createHash12 } from "crypto";
 import { readFile as readFile10 } from "fs/promises";
-import { fileURLToPath as fileURLToPath6 } from "url";
-import { dirname as dirname9, join as join15 } from "path";
+import { fileURLToPath as fileURLToPath7 } from "url";
+import { dirname as dirname10, join as join16 } from "path";
 
 // src/feature/instance/build/executable.ts
 import { createHash as createHash11 } from "crypto";
 import { readFile as readFile9 } from "fs/promises";
-import { join as join14 } from "path";
+import { join as join15 } from "path";
 var buildExecutable = async (input, outputPath, architecture) => {
-  const filePath = join14(outputPath, "program");
+  const filePath = join15(outputPath, "program");
   const target2 = architecture === "x86_64" ? "bun-linux-x64" : "bun-linux-arm64";
   let result;
   try {
@@ -105449,7 +105488,7 @@ ${result.logs?.map((log) => log.message).join(`
 };
 
 // src/feature/pubsub/util.ts
-var __dirname2 = dirname9(fileURLToPath6(import.meta.url));
+var __dirname2 = dirname10(fileURLToPath7(import.meta.url));
 var WS_PORT = 3000;
 var ARCHITECTURE = "arm64";
 var CPU = "0.25 vCPU";
@@ -105465,7 +105504,7 @@ var createPubSubService = (parentGroup, ctx, id, props, inputs) => {
   });
   const shortName = shortId(`${ctx.app.name}:pubsub:${id}:${ctx.appId}`);
   const image = "public.ecr.aws/aws-cli/aws-cli:arm64";
-  const bundleFile = join15(__dirname2, "handlers/pubsub-server.js");
+  const bundleFile = join16(__dirname2, "handlers/pubsub-server.js");
   ctx.registerBuild("pubsub", name, async (build2) => {
     const hash2 = createHash12("sha1").update(await readFile10(bundleFile)).digest("hex");
     const fingerprint = `${hash2}-${ARCHITECTURE}`;
@@ -105753,7 +105792,7 @@ var createPubSubService = (parentGroup, ctx, id, props, inputs) => {
 };
 
 // src/feature/pubsub/index.ts
-var __dirname3 = dirname10(fileURLToPath7(import.meta.url));
+var __dirname3 = dirname11(fileURLToPath8(import.meta.url));
 var typeGenCode4 = `
 import type { Mock } from 'vitest'
 
@@ -105996,7 +106035,7 @@ var pubsubFeature = defineFeature({
       const publisherRouteKey = formatRouteKey("base", "pubsub", `${id}-publisher`);
       bundle.addHandler({
         routeKey: publisherRouteKey,
-        file: join16(__dirname3, "/handlers/pubsub-publisher.js"),
+        file: join17(__dirname3, "/handlers/pubsub-publisher.js"),
         exportName: "default"
       });
       bundle.addEnv(formatRouteEnvName3(publisherRouteKey, "REDIS_HOST"), redisHost);
@@ -106257,8 +106296,8 @@ var restFeature = defineFeature({
 
 // src/feature/rpc/index.ts
 import { formatRouteEnvName as formatRouteEnvName4 } from "awsless";
-import { dirname as dirname11, join as join17, relative as relative5 } from "path";
-import { fileURLToPath as fileURLToPath8 } from "url";
+import { dirname as dirname12, join as join18, relative as relative5 } from "path";
+import { fileURLToPath as fileURLToPath9 } from "url";
 import { toSeconds as toSeconds7 } from "@awsless/duration";
 var rpcFeature = defineFeature({
   name: "rpc",
@@ -106310,7 +106349,7 @@ var rpcFeature = defineFeature({
       const serverRouteKey = formatRouteKey("base", "rpc", id);
       bundle.addHandler({
         routeKey: serverRouteKey,
-        file: join17(dirname11(fileURLToPath8(import.meta.url)), "/handlers/rpc.js"),
+        file: join18(dirname12(fileURLToPath9(import.meta.url)), "/handlers/rpc.js"),
         exportName: "default"
       });
       bundle.addEnv(formatRouteEnvName4(serverRouteKey, "TIMEOUT"), toSeconds7(ctx.appConfig.defaults.function.timeout).toString());
@@ -106460,11 +106499,11 @@ var searchFeature = defineFeature({
 
 // src/feature/site/index.ts
 import { createHash as createHash13 } from "crypto";
-import { dirname as dirname13, join as join20 } from "path";
+import { dirname as dirname14, join as join21 } from "path";
 
 // src/util/cache.ts
 import { lstat as lstat3, readdir as readdir4 } from "fs/promises";
-import { join as join18 } from "path";
+import { join as join19 } from "path";
 var generateCacheKey = async (directories2) => {
   const files = await listAllFiles(directories2);
   const sortedFiles = files.toSorted();
@@ -106491,7 +106530,7 @@ var listAllFiles = async (list2) => {
         recursive: true,
         withFileTypes: true
       });
-      files.push(...dirents.filter((d3) => d3.isFile()).map((file2) => join18(file2.parentPath, file2.name)));
+      files.push(...dirents.filter((d3) => d3.isFile()).map((file2) => join19(file2.parentPath, file2.name)));
     } else if (stat5.isFile()) {
       files.push(entry);
     }
@@ -106500,7 +106539,7 @@ var listAllFiles = async (list2) => {
 };
 
 // src/feature/site/static-routes.ts
-import { basename as basename3, dirname as dirname12, join as join19 } from "path";
+import { basename as basename3, dirname as dirname13, join as join20 } from "path";
 var isPageFile = (file2) => {
   return file2.endsWith(".html") || !basename3(file2).includes(".");
 };
@@ -106510,7 +106549,7 @@ var pageUrl = (file2) => {
   }
   const url = file2.slice(0, -".html".length);
   if (basename3(url) === "index") {
-    return dirname12(url);
+    return dirname13(url);
   }
   return url;
 };
@@ -106519,10 +106558,10 @@ var planStaticRoutes = (files, sitePath) => {
   const pages = files.filter((file2) => isPageFile(file2));
   const assets = files.filter((file2) => !isPageFile(file2));
   for (const page of pages) {
-    plan.files[join19(sitePath, pageUrl(page))] = page;
+    plan.files[join20(sitePath, pageUrl(page))] = page;
   }
   if (sitePath !== "/") {
-    plan.catchAll = join19(sitePath, "*.");
+    plan.catchAll = join20(sitePath, "*.");
     return plan;
   }
   const folders = new Set;
@@ -106532,9 +106571,9 @@ var planStaticRoutes = (files, sitePath) => {
       folders.add(folder);
       continue;
     }
-    plan.files[join19(sitePath, asset)] = asset;
+    plan.files[join20(sitePath, asset)] = asset;
   }
-  plan.dirs = [...folders].map((folder) => join19(sitePath, folder, "*."));
+  plan.dirs = [...folders].map((folder) => join20(sitePath, folder, "*."));
   return plan;
 };
 
@@ -106559,7 +106598,7 @@ var siteFeature = defineFeature({
           return build2(fingerprint, async (write) => {
             const credentialProvider = await getCredentials(ctx.appConfig.profile);
             const credentials2 = await credentialProvider();
-            const cwd = join20(directories.root, dirname13(ctx.stackConfig.file));
+            const cwd = join21(directories.root, dirname14(ctx.stackConfig.file));
             const env2 = {
               ...process.env,
               APP: ctx.appConfig.name,
@@ -106598,7 +106637,37 @@ ${(errors3.trim() || output.trim()).slice(-2000)}`);
           });
         });
       }
-      if (props.ssr) {
+      if (props.ssr && isStandaloneFunction(props.ssr)) {
+        const fn = createLambdaFunction(ctx, `${id}-ssr`, props.ssr);
+        const url = new aws.lambda.FunctionUrl(group, "ssr-url", {
+          functionName: fn.lambda.functionName,
+          authorizationType: "AWS_IAM"
+        });
+        new aws.lambda.Permission(group, "ssr-url-permission", {
+          functionName: fn.lambda.functionName,
+          statementId: "cloudfront-url",
+          principal: "cloudfront.amazonaws.com",
+          sourceAccount: ctx.accountId,
+          action: "lambda:InvokeFunctionUrl",
+          functionUrlAuthType: "AWS_IAM"
+        });
+        new aws.lambda.Permission(group, "ssr-invoke-permission", {
+          functionName: fn.lambda.functionName,
+          statementId: "cloudfront-invoke",
+          principal: "cloudfront.amazonaws.com",
+          sourceAccount: ctx.accountId,
+          action: "lambda:InvokeFunction",
+          invokedViaFunctionUrl: true
+        });
+        addRoutes({
+          [routeKey]: {
+            type: "lambda",
+            forwardHost: true,
+            urlEncodedQueryString: true,
+            domainName: url.functionUrl.pipe((url2) => url2.split("/")[2])
+          }
+        });
+      } else if (props.ssr) {
         const ssr = props.ssr;
         const bundleRouteKey = formatRouteKey(ctx.stack.name, "site", id);
         registerBundleFunction(ctx, bundleRouteKey, ssr);
@@ -106623,7 +106692,7 @@ ${(errors3.trim() || output.trim()).slice(-2000)}`);
               cwd: staticDir,
               nodir: true
             }).sort();
-            const hashes = files.map((file2) => $hash(join20(staticDir, file2)));
+            const hashes = files.map((file2) => $hash(join21(staticDir, file2)));
             const version = $combine(...hashes).pipe((hashes2) => {
               const hash2 = createHash13("sha1");
               for (const [index, file2] of files.entries()) {
@@ -106671,7 +106740,7 @@ ${(errors3.trim() || output.trim()).slice(-2000)}`);
 });
 
 // src/feature/store/index.ts
-import { join as join21 } from "path";
+import { join as join22 } from "path";
 import { toDays as toDays8 } from "@awsless/duration";
 
 // src/feature/store/util.ts
@@ -106794,8 +106863,8 @@ var storeFeature = defineFeature({
               key: `${folder}${file2}`,
               cacheControl: getCacheControl(file2),
               contentType: getContentType(file2),
-              source: join21(props.static, file2),
-              sourceHash: $hash(join21(props.static, file2))
+              source: join22(props.static, file2),
+              sourceHash: $hash(join22(props.static, file2))
             }, {
               replaceOnChanges: ["bucket", "key"]
             });
@@ -107433,7 +107502,7 @@ var layerFeature = defineFeature({
         skipDestroy: true
       }, {
         dependsOn: [zip],
-        replaceOnChanges: ["sourceCodeHash", "s3ObjectVersion"]
+        replaceOnChanges: ["sourceCodeHash"]
       });
       ctx.shared.add("layer", "arn", id, layer.arn);
       ctx.shared.add("layer", "packages", id, props.packages ?? [id]);
@@ -107444,8 +107513,8 @@ var layerFeature = defineFeature({
 // src/feature/image/index.ts
 import { toDays as toDays9 } from "@awsless/duration";
 import { formatRouteEnvName as formatRouteEnvName5 } from "awsless";
-import { dirname as dirname14, join as join22 } from "path";
-import { fileURLToPath as fileURLToPath9 } from "url";
+import { dirname as dirname15, join as join23 } from "path";
+import { fileURLToPath as fileURLToPath10 } from "url";
 var imageFeature = defineFeature({
   name: "image",
   onApp(ctx) {
@@ -107459,7 +107528,7 @@ var imageFeature = defineFeature({
       throw new FileError("app.json", "The image feature requires an arm64 function bundle.");
     }
     const group = new Group(ctx.base, "image", "layer");
-    const path2 = join22(dirname14(fileURLToPath9(import.meta.url)), "/layers/sharp-arm.zip");
+    const path2 = join23(dirname15(fileURLToPath10(import.meta.url)), "/layers/sharp-arm.zip");
     const layerId = formatGlobalResourceName({
       appName: ctx.appConfig.name,
       resourceType: "layer",
@@ -107490,7 +107559,7 @@ var imageFeature = defineFeature({
       skipDestroy: true
     }, {
       dependsOn: [zipFile],
-      replaceOnChanges: ["sourceCodeHash", "s3ObjectVersion"]
+      replaceOnChanges: ["sourceCodeHash"]
     });
     ctx.shared.add("layer", "arn", layerId, layer.arn);
     const bundle = ctx.shared.get("bundle", "main");
@@ -107524,7 +107593,7 @@ var imageFeature = defineFeature({
       const serverRouteKey = formatRouteKey(ctx.stack.name, "image", id);
       bundle.addHandler({
         routeKey: serverRouteKey,
-        file: join22(dirname14(fileURLToPath9(import.meta.url)), "/handlers/image.js"),
+        file: join23(dirname15(fileURLToPath10(import.meta.url)), "/handlers/image.js"),
         exportName: "default",
         external: ["sharp"]
       });
@@ -107562,8 +107631,8 @@ var imageFeature = defineFeature({
             new aws.s3.BucketObject(group, `static-${file2}`, {
               bucket: bucket.name,
               key: `${folder}origin/${file2}`,
-              source: join22(props.origin.static, file2),
-              sourceHash: $hash(join22(props.origin.static, file2))
+              source: join23(props.origin.static, file2),
+              sourceHash: $hash(join23(props.origin.static, file2))
             }, {
               replaceOnChanges: ["bucket", "key"]
             });
@@ -107579,8 +107648,8 @@ var imageFeature = defineFeature({
 // src/feature/icon/index.ts
 import { toDays as toDays10 } from "@awsless/duration";
 import { formatRouteEnvName as formatRouteEnvName6 } from "awsless";
-import { dirname as dirname15, join as join23 } from "path";
-import { fileURLToPath as fileURLToPath10 } from "url";
+import { dirname as dirname16, join as join24 } from "path";
+import { fileURLToPath as fileURLToPath11 } from "url";
 var iconFeature = defineFeature({
   name: "icon",
   onStack(ctx) {
@@ -107611,7 +107680,7 @@ var iconFeature = defineFeature({
       const serverRouteKey = formatRouteKey(ctx.stack.name, "icon", id);
       bundle.addHandler({
         routeKey: serverRouteKey,
-        file: join23(dirname15(fileURLToPath10(import.meta.url)), "/handlers/icon.js"),
+        file: join24(dirname16(fileURLToPath11(import.meta.url)), "/handlers/icon.js"),
         exportName: "default"
       });
       addRoutes({
@@ -107651,8 +107720,8 @@ var iconFeature = defineFeature({
             new aws.s3.BucketObject(group, `static-${file2}`, {
               bucket: bucket.name,
               key: `${folder}origin/${file2}`,
-              source: join23(props.origin.static, file2),
-              sourceHash: $hash(join23(props.origin.static, file2))
+              source: join24(props.origin.static, file2),
+              sourceHash: $hash(join24(props.origin.static, file2))
             }, {
               replaceOnChanges: ["bucket", "key"]
             });
@@ -107679,10 +107748,10 @@ var import_deepmerge4 = __toESM(require_cjs2(), 1);
 // src/feature/job/build/executable.ts
 import { createHash as createHash14 } from "crypto";
 import { readFile as readFile11, writeFile as writeFile7 } from "fs/promises";
-import { join as join24, resolve as resolve3 } from "path";
+import { join as join25, resolve as resolve3 } from "path";
 var buildJobExecutable = async (input, outputPath, architecture) => {
-  const filePath = join24(outputPath, "program");
-  const wrapperPath = join24(outputPath, "wrapper.ts");
+  const filePath = join25(outputPath, "program");
+  const wrapperPath = join25(outputPath, "wrapper.ts");
   const handlerPath = resolve3(input);
   await writeFile7(wrapperPath, `import { parse } from '@awsless/json'
 import { getObject } from '@awsless/s3'
@@ -108186,7 +108255,7 @@ var jobFeature = defineFeature({
 });
 
 // src/feature/instance/index.ts
-import { days as days9, seconds as seconds6, toSeconds as toSeconds11 } from "@awsless/duration";
+import { days as days10, seconds as seconds6, toSeconds as toSeconds11 } from "@awsless/duration";
 
 // src/feature/instance/util.ts
 import { toDays as toDays12, toSeconds as toSeconds10 } from "@awsless/duration";
@@ -108194,7 +108263,7 @@ import { stringify as stringify3 } from "@awsless/json";
 import { generateFileHash as generateFileHash4 } from "@awsless/ts-file-cache";
 var import_deepmerge6 = __toESM(require_cjs2(), 1);
 import { createHash as createHash16 } from "crypto";
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 var createFargateTask = (parentGroup, ctx, ns, id, local) => {
   const group = new Group(parentGroup, "instance", ns);
   const name = formatLocalResourceName({
@@ -108399,7 +108468,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
           healthCheck: props.healthCheck ? {
             command: [
               "CMD-SHELL",
-              `curl -f http://${join25("localhost", props.healthCheck.path)} || exit 1`
+              `curl -f http://${join26("localhost", props.healthCheck.path)} || exit 1`
             ],
             interval: toSeconds10(props.healthCheck.interval),
             retries: props.healthCheck.retries,
@@ -108570,7 +108639,7 @@ var instanceFeature = defineFeature({
       const queue2 = new aws.sqs.Queue(group, "queue", {
         name: task2.name,
         visibilityTimeoutSeconds: toSeconds11(seconds6(30)),
-        messageRetentionSeconds: toSeconds11(days9(4)),
+        messageRetentionSeconds: toSeconds11(days10(4)),
         maxMessageSize: toBytes(kibibytes(256)),
         receiveWaitTimeSeconds: toSeconds11(seconds6(20))
       });
@@ -108728,7 +108797,7 @@ var metricFeature = defineFeature({
 });
 
 // src/feature/router/index.ts
-import { days as days10, seconds as seconds8, toSeconds as toSeconds14, years } from "@awsless/duration";
+import { days as days11, seconds as seconds8, toSeconds as toSeconds14, years } from "@awsless/duration";
 
 // src/feature/router/router-code.ts
 import { minutes as minutes8, seconds as seconds7, toSeconds as toSeconds13 } from "@awsless/duration";
@@ -109202,7 +109271,7 @@ var MAX_VALUE_SIZE = 1000;
 var ORIGIN_PLACEHOLDER = "x".repeat(64);
 var assertRouteValueSize = (key, route) => {
   const withOrigin = (entry) => {
-    return entry.type === "lambda" ? { ...entry, domainName: ORIGIN_PLACEHOLDER } : entry;
+    return entry.type === "lambda" && !entry.domainName ? { ...entry, domainName: ORIGIN_PLACEHOLDER } : entry;
   };
   for (const entry of Array.isArray(route) ? route : [route]) {
     if (Buffer.byteLength(JSON.stringify(withOrigin(entry)), "utf8") > MAX_VALUE_SIZE) {
@@ -109274,15 +109343,15 @@ var routerFeature = defineFeature({
         for (const dependency of options?.dependsOn ?? []) {
           routeDependencies.add(dependency);
         }
-        if (Object.values(newRoutes).flat().some((route) => route.type === "lambda")) {
+        if (Object.values(newRoutes).flat().some((route) => route.type === "lambda" && !route.domainName)) {
           hasLambdaRoutes = true;
         }
       });
       const cache = new aws.cloudfront.CachePolicy(group, "cache", {
         name,
         minTtl: toSeconds14(seconds8(0)),
-        maxTtl: toSeconds14(days10(365)),
-        defaultTtl: toSeconds14(days10(0)),
+        maxTtl: toSeconds14(days11(365)),
+        defaultTtl: toSeconds14(days11(0)),
         parametersInCacheKeyAndForwardedToOrigin: {
           enableAcceptEncodingBrotli: true,
           enableAcceptEncodingGzip: true,
@@ -109653,7 +109722,7 @@ var routerFeature = defineFeature({
             functionVersion: bundle.lambda.version,
             routes: $resolve([routes, lambdaUrlHost], (routes2, lambdaUrlHost2) => {
               const withOrigin = (route) => {
-                return route.type === "lambda" ? { ...route, domainName: lambdaUrlHost2 } : route;
+                return route.type === "lambda" && !route.domainName ? { ...route, domainName: lambdaUrlHost2 } : route;
               };
               return Object.entries(routes2).flatMap(([key, route]) => createRouteStoreEntries(key, Array.isArray(route) ? route.map(withOrigin) : withOrigin(route)));
             })
@@ -111099,20 +111168,20 @@ import { DynamoDBClient as DynamoDBClient3 } from "@awsless/dynamodb";
 // src/cli/ui/complex/run-tests.ts
 var import_wildstring3 = __toESM(require_wildstring(), 1);
 import { mkdir as mkdir6, readFile as readFile12, writeFile as writeFile8 } from "fs/promises";
-import { join as join27 } from "path";
+import { join as join28 } from "path";
 import { parse as parse5, stringify as stringify4 } from "@awsless/json";
 import { generateFolderHash, loadWorkspace as loadWorkspace2 } from "@awsless/ts-file-cache";
 
 // src/test/start.ts
-import { dirname as dirname16, join as join26 } from "path";
-import { fileURLToPath as fileURLToPath11 } from "url";
+import { dirname as dirname17, join as join27 } from "path";
+import { fileURLToPath as fileURLToPath12 } from "url";
 import { configDefaults } from "vitest/config";
 import { startVitest } from "vitest/node";
 
 class NullReporter {
 }
 var startTest = async (props) => {
-  const __dirname4 = dirname16(fileURLToPath11(import.meta.url));
+  const __dirname4 = dirname17(fileURLToPath12(import.meta.url));
   const startTime = process.hrtime.bigint();
   process.noDeprecation = true;
   const vitest = await startVitest("test", props.filters, {
@@ -111124,8 +111193,9 @@ var startTest = async (props) => {
     exclude: ["**/_*", "**/_*/**", ...configDefaults.exclude],
     globals: true,
     reporters: [new NullReporter],
+    env: props.env,
     setupFiles: [
-      join26(__dirname4, "test-global-setup.js")
+      join27(__dirname4, "test-global-setup.js")
     ]
   }, {
     logLevel: "silent",
@@ -111279,7 +111349,7 @@ var logTestErrors = (event) => {
 };
 var runTest = async (stack, dir, filters, workspace, opts) => {
   await mkdir6(directories.test, { recursive: true });
-  const file2 = join27(directories.test, `${stack}.json`);
+  const file2 = join28(directories.test, `${stack}.json`);
   const fingerprint = await generateFolderHash(workspace, dir);
   if (!process.env.NO_CACHE) {
     const exists2 = await fileExist(file2);
@@ -111306,7 +111376,8 @@ var runTest = async (stack, dir, filters, workspace, opts) => {
     async task(ctx) {
       const result2 = await startTest({
         dir,
-        filters
+        filters,
+        env: opts.env
       });
       if (result2.errors.length > 0) {
         throw result2.errors.map((error3) => new ExpectedError(error3.message));
@@ -111339,7 +111410,13 @@ var runTests = async (tests, stackFilters = [], testFilters = [], opts) => {
       }
     }
     for (const path2 of test.paths) {
-      const result = await runTest(test.name, path2, testFilters, workspace, opts);
+      const result = await runTest(test.name, path2, testFilters, workspace, {
+        ...opts,
+        env: {
+          ...opts.env,
+          STACK: test.stackName
+        }
+      });
       if (!result) {
         return false;
       }
@@ -111384,7 +111461,7 @@ var deploy = (program3) => {
         appName: appConfig.name
       });
       const deployment = await claimDeployment({ client: dynamo, appId: globalAppId });
-      const { app, tests, warnings, builders, ready } = createApp({
+      const { app, tests, warnings, builders, ready, appId } = createApp({
         appConfig,
         stackConfigs,
         accountId,
@@ -111402,7 +111479,13 @@ var deploy = (program3) => {
       }
       if (!options.skipTests) {
         const passed = await runTests(tests, [], [], {
-          showLogs: false
+          showLogs: false,
+          env: {
+            APP: appConfig.name,
+            APP_ID: appId,
+            AWS_REGION: appConfig.region,
+            AWS_ACCOUNT_ID: accountId
+          }
         });
         if (!passed) {
           throw new Cancelled2;
@@ -112633,7 +112716,7 @@ var watchConfig = async (options, resolve4, reject) => {
 
 // src/type-gen/generate.ts
 import { mkdir as mkdir7, writeFile as writeFile9 } from "fs/promises";
-import { dirname as dirname17, join as join28, relative as relative8 } from "path";
+import { dirname as dirname18, join as join29, relative as relative8 } from "path";
 var generateTypes = async (props) => {
   const files = [];
   await Promise.all(features.map((feature) => {
@@ -112641,12 +112724,12 @@ var generateTypes = async (props) => {
       ...props,
       async write(file2, data, include = false) {
         const code = data?.toString("utf8");
-        const path2 = join28(directories.types, file2);
+        const path2 = join29(directories.types, file2);
         if (code) {
           if (include) {
             files.push(relative8(directories.root, path2));
           }
-          await mkdir7(dirname17(path2), { recursive: true });
+          await mkdir7(dirname18(path2), { recursive: true });
           await writeFile9(path2, code);
         }
       }
@@ -112655,7 +112738,7 @@ var generateTypes = async (props) => {
   if (files.length) {
     const code = files.map((file2) => `/// <reference path='${file2}' />`).join(`
 `);
-    await writeFile9(join28(directories.root, `awsless.d.ts`), code);
+    await writeFile9(join29(directories.root, `awsless.d.ts`), code);
   }
 };
 
@@ -114752,7 +114835,7 @@ var DEFAULT_PROFILE = "default";
 var getProfileName = (init) => init.profile || process.env[ENV_PROFILE] || DEFAULT_PROFILE;
 
 // ../../node_modules/.pnpm/@smithy+shared-ini-file-loader@4.4.7/node_modules/@smithy/shared-ini-file-loader/dist-es/loadSharedConfigFiles.js
-import { join as join31 } from "path";
+import { join as join32 } from "path";
 
 // ../../node_modules/.pnpm/@smithy+shared-ini-file-loader@4.4.7/node_modules/@smithy/shared-ini-file-loader/dist-es/constants.js
 var CONFIG_PREFIX_SEPARATOR = ".";
@@ -114774,14 +114857,14 @@ var getConfigData = (data) => Object.entries(data).filter(([key]) => {
 });
 
 // ../../node_modules/.pnpm/@smithy+shared-ini-file-loader@4.4.7/node_modules/@smithy/shared-ini-file-loader/dist-es/getConfigFilepath.js
-import { join as join29 } from "path";
+import { join as join30 } from "path";
 var ENV_CONFIG_PATH = "AWS_CONFIG_FILE";
-var getConfigFilepath = () => process.env[ENV_CONFIG_PATH] || join29(getHomeDir(), ".aws", "config");
+var getConfigFilepath = () => process.env[ENV_CONFIG_PATH] || join30(getHomeDir(), ".aws", "config");
 
 // ../../node_modules/.pnpm/@smithy+shared-ini-file-loader@4.4.7/node_modules/@smithy/shared-ini-file-loader/dist-es/getCredentialsFilepath.js
-import { join as join30 } from "path";
+import { join as join31 } from "path";
 var ENV_CREDENTIALS_PATH = "AWS_SHARED_CREDENTIALS_FILE";
-var getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] || join30(getHomeDir(), ".aws", "credentials");
+var getCredentialsFilepath = () => process.env[ENV_CREDENTIALS_PATH] || join31(getHomeDir(), ".aws", "credentials");
 
 // ../../node_modules/.pnpm/@smithy+shared-ini-file-loader@4.4.7/node_modules/@smithy/shared-ini-file-loader/dist-es/parseIni.js
 var prefixKeyRegex = /^([\w-]+)\s(["'])?([\w-@\+\.%:/]+)\2$/;
@@ -114854,11 +114937,11 @@ var loadSharedConfigFiles = async (init = {}) => {
   const relativeHomeDirPrefix = "~/";
   let resolvedFilepath = filepath;
   if (filepath.startsWith(relativeHomeDirPrefix)) {
-    resolvedFilepath = join31(homeDir, filepath.slice(2));
+    resolvedFilepath = join32(homeDir, filepath.slice(2));
   }
   let resolvedConfigFilepath = configFilepath;
   if (configFilepath.startsWith(relativeHomeDirPrefix)) {
-    resolvedConfigFilepath = join31(homeDir, configFilepath.slice(2));
+    resolvedConfigFilepath = join32(homeDir, configFilepath.slice(2));
   }
   const parsedFiles = await Promise.all([
     readFile13(resolvedConfigFilepath, {
@@ -115951,16 +116034,16 @@ var getRuntimeUserAgentPair = () => {
 
 // ../../node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es/getTypeScriptUserAgentPair.js
 import { readFile as readFile15 } from "fs/promises";
-import { join as join33 } from "path";
+import { join as join34 } from "path";
 
 // ../../node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es/getNodeModulesParentDirs.js
 import { normalize as normalize3, sep as sep3 } from "path";
-var getNodeModulesParentDirs = (dirname19) => {
+var getNodeModulesParentDirs = (dirname20) => {
   const cwd = process.cwd();
-  if (!dirname19) {
+  if (!dirname20) {
     return [cwd];
   }
-  const normalizedPath = normalize3(dirname19);
+  const normalizedPath = normalize3(dirname20);
   const parts = normalizedPath.split(sep3);
   const nodeModulesIndex = parts.indexOf("node_modules");
   const parentDir = nodeModulesIndex !== -1 ? parts.slice(0, nodeModulesIndex).join(sep3) : normalizedPath;
@@ -115999,7 +116082,7 @@ var getSanitizedDevTypeScriptVersion = (version2 = "") => {
 // ../../node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es/getTypeScriptUserAgentPair.js
 var __dirname = "/Users/work/Code/awsless/node_modules/.pnpm/@aws-sdk+util-user-agent-node@3.973.14_aws-crt@1.30.0_supports-color@8.1.1_/node_modules/@aws-sdk/util-user-agent-node/dist-es";
 var tscVersion;
-var TS_PACKAGE_JSON = join33("node_modules", "typescript", "package.json");
+var TS_PACKAGE_JSON = join34("node_modules", "typescript", "package.json");
 var getTypeScriptUserAgentPair = async () => {
   if (tscVersion === null) {
     return;
@@ -116014,12 +116097,12 @@ var getTypeScriptUserAgentPair = async () => {
     tscVersion = null;
     return;
   }
-  const dirname19 = typeof __dirname !== "undefined" ? __dirname : undefined;
-  const nodeModulesParentDirs = getNodeModulesParentDirs(dirname19);
+  const dirname20 = typeof __dirname !== "undefined" ? __dirname : undefined;
+  const nodeModulesParentDirs = getNodeModulesParentDirs(dirname20);
   let versionFromApp;
   for (const nodeModulesParentDir of nodeModulesParentDirs) {
     try {
-      const appPackageJsonPath = join33(nodeModulesParentDir, "package.json");
+      const appPackageJsonPath = join34(nodeModulesParentDir, "package.json");
       const packageJson = await readFile15(appPackageJsonPath, "utf-8");
       const { dependencies, devDependencies } = JSON.parse(packageJson);
       const version2 = devDependencies?.typescript ?? dependencies?.typescript;
@@ -116037,7 +116120,7 @@ var getTypeScriptUserAgentPair = async () => {
   let versionFromNodeModules;
   for (const nodeModulesParentDir of nodeModulesParentDirs) {
     try {
-      const tsPackageJsonPath = join33(nodeModulesParentDir, TS_PACKAGE_JSON);
+      const tsPackageJsonPath = join34(nodeModulesParentDir, TS_PACKAGE_JSON);
       const packageJson = await readFile15(tsPackageJsonPath, "utf-8");
       const { version: version2 } = JSON.parse(packageJson);
       const sanitizedVersion2 = getSanitizedTypeScriptVersion(version2);
@@ -119098,7 +119181,7 @@ var sinon;
   const arraySlice = arrayProto.slice;
   const concat = arrayProto.concat;
   const forEach = arrayProto.forEach;
-  const join34 = arrayProto.join;
+  const join35 = arrayProto.join;
   const splice = arrayProto.splice;
   function applyDefaults(obj, defaults2) {
     for (const key of Object.keys(defaults2)) {
@@ -119134,7 +119217,7 @@ var sinon;
         let actual = "";
         if (!calledInOrder(arguments)) {
           try {
-            expected = join34(arguments, ", ");
+            expected = join35(arguments, ", ");
             const calls = arraySlice(arguments);
             let i4 = calls.length;
             while (i4) {
@@ -119142,7 +119225,7 @@ var sinon;
                 splice(calls, i4, 1);
               }
             }
-            actual = join34(orderByFirstCall(calls), ", ");
+            actual = join35(orderByFirstCall(calls), ", ");
           } catch (e7) {}
           failAssertion(this, `expected ${expected} to be called in order but were called as ${actual}`);
         } else {
@@ -119187,7 +119270,7 @@ var sinon;
             `    expected = ${inspect(expectation)}`,
             `    actual = ${inspect(actual)}`
           ];
-          failAssertion(this, join34(formatted, `
+          failAssertion(this, join35(formatted, `
 `));
         }
       }
@@ -119292,7 +119375,7 @@ var sinon;
   const valueToString = require2("@sinonjs/commons").valueToString;
   const exportAsyncBehaviors = require2("./util/core/export-async-behaviors");
   const concat = arrayProto.concat;
-  const join34 = arrayProto.join;
+  const join35 = arrayProto.join;
   const reverse = arrayProto.reverse;
   const slice = arrayProto.slice;
   const useLeftMostCallback = -1;
@@ -119329,7 +119412,7 @@ var sinon;
         msg = `${functionName(behavior.stub)} expected to yield, but no callback was passed.`;
       }
       if (args.length > 0) {
-        msg += ` Received [${join34(args, ", ")}]`;
+        msg += ` Received [${join35(args, ", ")}]`;
       }
       return msg;
     }
@@ -120139,7 +120222,7 @@ var sinon;
   const filter2 = arrayProto.filter;
   const forEach = arrayProto.forEach;
   const every = arrayProto.every;
-  const join34 = arrayProto.join;
+  const join35 = arrayProto.join;
   const push = arrayProto.push;
   const slice = arrayProto.slice;
   const unshift = arrayProto.unshift;
@@ -120216,10 +120299,10 @@ var sinon;
       });
       this.restore();
       if (messages.length > 0) {
-        mockExpectation.fail(join34(concat(messages, met), `
+        mockExpectation.fail(join35(concat(messages, met), `
 `));
       } else if (met.length > 0) {
-        mockExpectation.pass(join34(concat(messages, met), `
+        mockExpectation.pass(join35(concat(messages, met), `
 `));
       }
       return true;
@@ -120272,7 +120355,7 @@ var sinon;
         args,
         stack: err.stack
       })}`);
-      mockExpectation.fail(join34(messages, `
+      mockExpectation.fail(join35(messages, `
 `));
     }
   });
@@ -120379,14 +120462,14 @@ var sinon;
   const valueToString = require2("@sinonjs/commons").valueToString;
   const concat = arrayProto.concat;
   const filter2 = arrayProto.filter;
-  const join34 = arrayProto.join;
+  const join35 = arrayProto.join;
   const map = arrayProto.map;
   const reduce = arrayProto.reduce;
   const slice = arrayProto.slice;
   function throwYieldError(proxy, text2, args) {
     let msg = functionName(proxy) + text2;
     if (args.length) {
-      msg += ` Received [${join34(slice(args), ", ")}]`;
+      msg += ` Received [${join35(slice(args), ", ")}]`;
     }
     throw new Error(msg);
   }
@@ -120508,7 +120591,7 @@ var sinon;
       const formattedArgs = map(this.args, function(arg) {
         return inspect(arg);
       });
-      callStr = `${callStr + join34(formattedArgs, ", ")})`;
+      callStr = `${callStr + join35(formattedArgs, ", ")})`;
       if (typeof this.returnValue !== "undefined") {
         callStr += ` => ${inspect(this.returnValue)}`;
       }
@@ -121239,7 +121322,7 @@ var sinon;
   const timesInWords = require2("./util/core/times-in-words");
   const inspect = require2("util").inspect;
   const jsDiff = require2("diff");
-  const join34 = arrayProto.join;
+  const join35 = arrayProto.join;
   const map = arrayProto.map;
   const push = arrayProto.push;
   const slice = arrayProto.slice;
@@ -121267,7 +121350,7 @@ var sinon;
       }
       return text2;
     });
-    return join34(objects, "");
+    return join35(objects, "");
   }
   function quoteStringValue(value) {
     if (typeof value === "string") {
@@ -121325,7 +121408,7 @@ ${stringifiedCall}`;
         push(calls, stringifiedCall);
       }
       return calls.length > 0 ? `
-${join34(calls, `
+${join35(calls, `
 `)}` : "";
     },
     t: function(spyInstance) {
@@ -121333,10 +121416,10 @@ ${join34(calls, `
       for (let i4 = 0, l5 = spyInstance.callCount;i4 < l5; ++i4) {
         push(objects, inspect(spyInstance.thisValues[i4]));
       }
-      return join34(objects, ", ");
+      return join35(objects, ", ");
     },
     "*": function(spyInstance, args) {
-      return join34(map(args, function(arg) {
+      return join35(map(args, function(arg) {
         return inspect(arg);
       }), ", ");
     }
@@ -121668,7 +121751,7 @@ ${join34(calls, `
 }, { "@sinonjs/commons": 48 }], 26: [function(require2, module, exports) {
   const arrayProto = require2("@sinonjs/commons").prototypes.array;
   const hasOwnProperty2 = require2("@sinonjs/commons").prototypes.object.hasOwnProperty;
-  const join34 = arrayProto.join;
+  const join35 = arrayProto.join;
   const push = arrayProto.push;
   const hasDontEnumBug = function() {
     const obj = {
@@ -121709,7 +121792,7 @@ ${join34(calls, `
         push(result, obj[prop]());
       }
     }
-    return join34(result, "") !== "0123456789";
+    return join35(result, "") !== "0123456789";
   }();
   function extendCommon(target2, sources, doCopy) {
     let source, i4, prop;
@@ -123774,7 +123857,7 @@ ${job.error.stack.split(`
   module.exports = matcherPrototype;
 }, { "../create-matcher": 63 }], 71: [function(require2, module, exports) {
   var functionName = require2("@sinonjs/commons").functionName;
-  var join34 = require2("@sinonjs/commons").prototypes.array.join;
+  var join35 = require2("@sinonjs/commons").prototypes.array.join;
   var map = require2("@sinonjs/commons").prototypes.array.map;
   var stringIndexOf = require2("@sinonjs/commons").prototypes.string.indexOf;
   var valueToString = require2("@sinonjs/commons").valueToString;
@@ -123805,7 +123888,7 @@ ${job.error.stack.split(`
         m5.test = function(actual) {
           return matchObject(actual, expectation, match3);
         };
-        m5.message = `match(${join34(array, ", ")})`;
+        m5.message = `match(${join35(array, ", ")})`;
         return m5;
       },
       regexp: function(m5, expectation) {
@@ -127129,7 +127212,7 @@ ${job.error.stack.split(`
       tokenize: function tokenize(value) {
         return value.split("");
       },
-      join: function join34(chars) {
+      join: function join35(chars) {
         return chars.join("");
       }
     };
@@ -135222,12 +135305,18 @@ var test2 = (program3) => {
       const region = props.appConfig.region;
       const credentials2 = await getCredentials(props.appConfig.profile);
       const accountId = await getAccountId(credentials2, region);
-      const { tests } = createApp({ ...props, accountId });
+      const { tests, appId } = createApp({ ...props, accountId });
       if (tests.length === 0) {
         return "No tests found.";
       }
       const passed = await runTests(tests, stacks, options?.filters, {
-        showLogs: true
+        showLogs: true,
+        env: {
+          APP: props.appConfig.name,
+          APP_ID: appId,
+          AWS_REGION: region,
+          AWS_ACCOUNT_ID: accountId
+        }
       });
       if (!passed) {
         throw new Cancelled2;