@effortless-aws/cli 0.2.2 → 0.3.0

package/dist/cli/index.js

@@ -8,16 +8,16 @@ var __export = (target, all) => {
 // src/cli/index.ts
 import { CliConfig, Command as Command7 } from "@effect/cli";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
-import { Effect as Effect45 } from "effect";
+import { Effect as Effect44 } from "effect";
 import { createRequire as createRequire2 } from "module";
 
 // src/cli/commands/deploy.ts
 import { Args, Command } from "@effect/cli";
-import { Effect as Effect38, Console as Console3, Logger, LogLevel, Option } from "effect";
+import { Effect as Effect37, Console as Console3, Logger, LogLevel, Option } from "effect";
 import * as path9 from "path";
 
 // src/deploy/deploy.ts
-import { Effect as Effect35, Console as Console2 } from "effect";
+import { Effect as Effect34, Console as Console2 } from "effect";
 
 // src/cli/colors.ts
 var wrap = (code) => (s) => `\x1B[${code}m${s}\x1B[0m`;
@@ -1933,6 +1933,11 @@ var publishVersion = (functionName) => Effect13.gen(function* () {
     version: result.Version
   };
 });
+var DEFAULT_CORS = {
+  AllowOrigins: ["*"],
+  AllowMethods: ["*"],
+  AllowHeaders: ["*"]
+};
 var ensureFunctionUrl = (functionName) => Effect13.gen(function* () {
   const existing = yield* lambda_exports.make("get_function_url_config", {
     FunctionName: functionName
@@ -1945,7 +1950,8 @@ var ensureFunctionUrl = (functionName) => Effect13.gen(function* () {
   if (existing) {
     yield* lambda_exports.make("update_function_url_config", {
       FunctionName: functionName,
-      AuthType: "NONE"
+      AuthType: "NONE",
+      Cors: DEFAULT_CORS
     });
     return { functionUrl: existing.FunctionUrl };
   }
@@ -1953,7 +1959,8 @@ var ensureFunctionUrl = (functionName) => Effect13.gen(function* () {
   const result = yield* lambda_exports.make("create_function_url_config", {
     FunctionName: functionName,
     AuthType: "NONE",
-    InvokeMode: "BUFFERED"
+    InvokeMode: "BUFFERED",
+    Cors: DEFAULT_CORS
   });
   return { functionUrl: result.FunctionUrl };
 });
@@ -2419,133 +2426,6 @@ var deleteTable = (tableName) => Effect16.gen(function* () {
 
 // src/aws/apigateway.ts
 import { Effect as Effect17 } from "effect";
-var ensureProjectApi = (config) => Effect17.gen(function* () {
-  const apiName = `${config.projectName}-${config.stage}`;
-  const existingApis = yield* apigatewayv2_exports.make("get_apis", {});
-  const existingApi = existingApis.Items?.find((api) => api.Name === apiName);
-  let apiId;
-  if (existingApi) {
-    yield* Effect17.logDebug(`Using existing API Gateway: ${apiName}`);
-    apiId = existingApi.ApiId;
-    if (config.tags) {
-      const apiArn = `arn:aws:apigateway:${config.region}::/apis/${apiId}`;
-      yield* apigatewayv2_exports.make("tag_resource", {
-        ResourceArn: apiArn,
-        Tags: config.tags
-      });
-    }
-  } else {
-    yield* Effect17.logDebug(`Creating API Gateway: ${apiName}`);
-    const createResult = yield* apigatewayv2_exports.make("create_api", {
-      Name: apiName,
-      ProtocolType: "HTTP",
-      CorsConfiguration: {
-        AllowOrigins: ["*"],
-        AllowMethods: ["*"],
-        AllowHeaders: ["*"]
-      },
-      Tags: config.tags
-    });
-    apiId = createResult.ApiId;
-    yield* apigatewayv2_exports.make("create_stage", {
-      ApiId: apiId,
-      StageName: "$default",
-      AutoDeploy: true
-    });
-  }
-  return { apiId };
-});
-var addRouteToApi = (config) => Effect17.gen(function* () {
-  const integrationUri = `arn:aws:apigateway:${config.region}:lambda:path/2015-03-31/functions/${config.functionArn}/invocations`;
-  const existingIntegrations = yield* apigatewayv2_exports.make("get_integrations", { ApiId: config.apiId });
-  let integrationId = existingIntegrations.Items?.find(
-    (i) => i.IntegrationUri === integrationUri
-  )?.IntegrationId;
-  if (!integrationId) {
-    yield* Effect17.logDebug("Creating integration");
-    const integrationResult = yield* apigatewayv2_exports.make("create_integration", {
-      ApiId: config.apiId,
-      IntegrationType: "AWS_PROXY",
-      IntegrationUri: integrationUri,
-      IntegrationMethod: "POST",
-      PayloadFormatVersion: "2.0"
-    });
-    integrationId = integrationResult.IntegrationId;
-  }
-  const routeKey = `${config.method} ${config.path}`;
-  const existingRoutes = yield* apigatewayv2_exports.make("get_routes", { ApiId: config.apiId });
-  const existingRoute = existingRoutes.Items?.find((r) => r.RouteKey === routeKey);
-  const target = `integrations/${integrationId}`;
-  if (!existingRoute) {
-    yield* Effect17.logDebug(`Creating route: ${routeKey}`);
-    yield* apigatewayv2_exports.make("create_route", {
-      ApiId: config.apiId,
-      RouteKey: routeKey,
-      Target: target
-    });
-  } else if (existingRoute.Target !== target) {
-    yield* Effect17.logDebug(`Updating route target: ${routeKey}`);
-    yield* apigatewayv2_exports.make("update_route", {
-      ApiId: config.apiId,
-      RouteId: existingRoute.RouteId,
-      RouteKey: routeKey,
-      Target: target
-    });
-  } else {
-    yield* Effect17.logDebug(`Route already exists: ${routeKey}`);
-  }
-  yield* addLambdaPermission(config.functionArn, config.apiId, config.region);
-  const apiUrl = `https://${config.apiId}.execute-api.${config.region}.amazonaws.com${config.path}`;
-  return { apiUrl };
-});
-var addLambdaPermission = (functionArn, apiId, region) => Effect17.gen(function* () {
-  const statementId = `apigateway-${apiId}`;
-  const accountId = functionArn.split(":")[4];
-  const sourceArn = `arn:aws:execute-api:${region}:${accountId}:${apiId}/*/*`;
-  yield* lambda_exports.make("add_permission", {
-    FunctionName: functionArn,
-    StatementId: statementId,
-    Action: "lambda:InvokeFunction",
-    Principal: "apigateway.amazonaws.com",
-    SourceArn: sourceArn
-  }).pipe(
-    Effect17.catchIf(
-      (e) => e._tag === "LambdaError" && e.is("ResourceConflictException"),
-      () => {
-        return Effect17.logDebug("Permission already exists");
-      }
-    )
-  );
-});
-var removeStaleRoutes = (apiId, activeRouteKeys) => Effect17.gen(function* () {
-  const existingRoutes = yield* apigatewayv2_exports.make("get_routes", { ApiId: apiId });
-  for (const route of existingRoutes.Items ?? []) {
-    if (route.RouteKey && !activeRouteKeys.has(route.RouteKey)) {
-      yield* Effect17.logDebug(`Removing stale route: ${route.RouteKey}`);
-      yield* apigatewayv2_exports.make("delete_route", {
-        ApiId: apiId,
-        RouteId: route.RouteId
-      });
-      const integrationId = route.Target?.replace("integrations/", "");
-      if (integrationId) {
-        const remainingRoutes = yield* apigatewayv2_exports.make("get_routes", { ApiId: apiId });
-        const stillUsed = remainingRoutes.Items?.some((r) => r.Target === route.Target);
-        if (!stillUsed) {
-          yield* Effect17.logDebug(`Removing orphaned integration: ${integrationId}`);
-          yield* apigatewayv2_exports.make("delete_integration", {
-            ApiId: apiId,
-            IntegrationId: integrationId
-          }).pipe(
-            Effect17.catchIf(
-              (e) => e._tag === "ApiGatewayV2Error" && e.is("NotFoundException"),
-              () => Effect17.logDebug(`Integration ${integrationId} already removed`)
-            )
-          );
-        }
-      }
-    }
-  }
-});
 var deleteApi = (apiId) => Effect17.gen(function* () {
   yield* Effect17.logDebug(`Deleting API Gateway: ${apiId}`);
   yield* apigatewayv2_exports.make("delete_api", {
@@ -2584,7 +2464,7 @@ var computeLockfileHash = (projectDir) => Effect18.gen(function* () {
   }
   const { packages: allPackages, resolvedPaths } = collectTransitiveDeps(projectDir, prodDeps);
   const packageVersions = [];
-  for (const pkgName of Array.from(allPackages).sort()) {
+  for (const pkgName of Array.from(allPackages).filter((p) => !isAwsRuntime(p)).sort()) {
     const pkgPath = resolvedPaths.get(pkgName) ?? findInPnpmStore(projectDir, pkgName) ?? getPackageRealPath(projectDir, pkgName);
     if (pkgPath) {
       const version2 = getPackageVersion(pkgPath);
@@ -2785,7 +2665,7 @@ var collectTransitiveDeps = (projectDir, rootDeps, searchPath = path.join(projec
   }
   return { packages: visited, resolvedPaths, warnings };
 };
-var isAwsRuntime = (pkg) => pkg.startsWith("@aws-sdk/") || pkg.startsWith("@smithy/");
+var isAwsRuntime = (pkg) => pkg.startsWith("@aws-sdk/") || pkg.startsWith("@smithy/") || pkg.startsWith("@aws-crypto/") || pkg.startsWith("@aws/");
 var collectLayerPackages = (projectDir, dependencies) => {
   if (dependencies.length === 0) return { packages: [], resolvedPaths: /* @__PURE__ */ new Map(), warnings: [] };
   const { packages, resolvedPaths, warnings } = collectTransitiveDeps(projectDir, dependencies);
@@ -2826,7 +2706,8 @@ var collectLayerPackages = (projectDir, dependencies) => {
       }
     }
   }
-  return { packages: Array.from(packages), resolvedPaths, warnings };
+  const filtered = Array.from(packages).filter((pkg) => !isAwsRuntime(pkg));
+  return { packages: filtered, resolvedPaths, warnings };
 };
 var findPackagePath = (projectDir, pkgName) => {
   const rootPath = getPackageRealPath(projectDir, pkgName);
@@ -4124,7 +4005,7 @@ var parseSource = (source) => {
   const project = new Project({ useInMemoryFileSystem: true });
   return project.createSourceFile("input.ts", source);
 };
-var RUNTIME_PROPS = ["onRequest", "onRecord", "onBatchComplete", "onBatch", "onMessage", "onObjectCreated", "onObjectRemoved", "setup", "schema", "onError", "deps", "config", "static", "middleware", "routes", "get", "post"];
+var RUNTIME_PROPS = ["onRecord", "onBatchComplete", "onBatch", "onMessage", "onObjectCreated", "onObjectRemoved", "setup", "schema", "onError", "deps", "config", "static", "middleware", "routes", "get", "post"];
 var evalConfig = (configText, exportName) => {
   try {
     return new Function(`return ${configText}`)();
@@ -4249,12 +4130,6 @@ var extractRoutePatterns = (obj) => {
   }).filter(Boolean);
 };
 var handlerRegistry = {
-  http: {
-    defineFn: "defineHttp",
-    handlerProps: ["onRequest"],
-    wrapperFn: "wrapHttp",
-    wrapperPath: "~/runtime/wrap-http"
-  },
   table: {
     defineFn: "defineTable",
     handlerProps: ["onRecord", "onBatch"],
@@ -4361,7 +4236,6 @@ export const handler = ${wrapperFn}(${importName});
 };
 
 // src/build/bundle.ts
-var extractConfigs = (source) => extractHandlerConfigs(source, "http");
 var extractTableConfigs = (source) => extractHandlerConfigs(source, "table");
 var extractAppConfigs = (source) => extractHandlerConfigs(source, "app");
 var extractStaticSiteConfigs = (source) => extractHandlerConfigs(source, "staticSite");
@@ -4373,7 +4247,7 @@ var _require = createRequire(import.meta.url);
 var runtimeDir = path3.join(path3.dirname(_require.resolve("effortless-aws/package.json")), "dist/runtime");
 var bundle = (input) => Effect24.gen(function* () {
   const exportName = input.exportName ?? "default";
-  const type = input.type ?? "http";
+  const type = input.type ?? "api";
   const externals = input.external ?? [];
   const sourcePath = path3.isAbsolute(input.file) ? input.file : `./${input.file}`;
   const entryPoint = generateEntryPoint(sourcePath, exportName, type, runtimeDir);
@@ -4462,7 +4336,6 @@ var findHandlerFiles = (patterns, cwd) => {
   return Array.from(files);
 };
 var discoverHandlers = (files) => {
-  const httpHandlers = [];
   const tableHandlers = [];
   const appHandlers = [];
   const staticSiteHandlers = [];
@@ -4473,7 +4346,6 @@ var discoverHandlers = (files) => {
   for (const file of files) {
     if (!fsSync2.statSync(file).isFile()) continue;
     const source = fsSync2.readFileSync(file, "utf-8");
-    const http = extractConfigs(source);
     const table = extractTableConfigs(source);
     const app = extractAppConfigs(source);
     const staticSite = extractStaticSiteConfigs(source);
@@ -4481,7 +4353,6 @@ var discoverHandlers = (files) => {
     const bucket = extractBucketConfigs(source);
     const mailer = extractMailerConfigs(source);
     const api = extractApiConfigs(source);
-    if (http.length > 0) httpHandlers.push({ file, exports: http });
     if (table.length > 0) tableHandlers.push({ file, exports: table });
     if (app.length > 0) appHandlers.push({ file, exports: app });
     if (staticSite.length > 0) staticSiteHandlers.push({ file, exports: staticSite });
@@ -4490,12 +4361,11 @@ var discoverHandlers = (files) => {
     if (mailer.length > 0) mailerHandlers.push({ file, exports: mailer });
     if (api.length > 0) apiHandlers.push({ file, exports: api });
   }
-  return { httpHandlers, tableHandlers, appHandlers, staticSiteHandlers, fifoQueueHandlers, bucketHandlers, mailerHandlers, apiHandlers };
+  return { tableHandlers, appHandlers, staticSiteHandlers, fifoQueueHandlers, bucketHandlers, mailerHandlers, apiHandlers };
 };
 var flattenHandlers = (discovered) => {
   const entries = (type, handlers) => handlers.flatMap((h) => h.exports.map((e) => ({ exportName: e.exportName, file: h.file, type })));
   return [
-    ...entries("http", discovered.httpHandlers),
     ...entries("table", discovered.tableHandlers),
     ...entries("app", discovered.appHandlers),
     ...entries("site", discovered.staticSiteHandlers),
@@ -4527,7 +4397,6 @@ var collectRequiredParams = (handlers, project, stage) => {
       }
     }
   };
-  collect(handlers.httpHandlers);
   collect(handlers.tableHandlers);
   collect(handlers.fifoQueueHandlers);
   collect(handlers.bucketHandlers);
@@ -4559,7 +4428,7 @@ var checkMissingParams = (params) => Effect25.gen(function* () {
   return { existing, missing };
 });
 
-// src/deploy/deploy-http.ts
+// src/deploy/deploy-table.ts
 import { Effect as Effect27 } from "effect";
 
 // src/deploy/shared.ts
@@ -4656,151 +4525,9 @@ var deployCoreLambda = ({
   return { functionArn, status, tagCtx };
 });
 
-// src/deploy/deploy-http.ts
-var deployLambda = ({ input, fn: fn13, layerArn, external, depsEnv, depsPermissions, staticGlobs }) => Effect27.gen(function* () {
-  const { exportName, config } = fn13;
-  const handlerName = exportName;
-  const { functionArn, status } = yield* deployCoreLambda({
-    input,
-    exportName,
-    handlerName,
-    bundleType: "http",
-    ...config.permissions ? { permissions: config.permissions } : {},
-    ...config.memory ? { memory: config.memory } : {},
-    ...config.timeout ? { timeout: config.timeout } : {},
-    ...layerArn ? { layerArn } : {},
-    ...external ? { external } : {},
-    ...depsEnv ? { depsEnv } : {},
-    ...depsPermissions ? { depsPermissions } : {},
-    ...staticGlobs && staticGlobs.length > 0 ? { staticGlobs } : {}
-  });
-  return { exportName, functionArn, status, config, handlerName };
-});
-var deploy = (input) => Effect27.gen(function* () {
-  const source = yield* readSource(input);
-  const configs = extractConfigs(source);
-  if (configs.length === 0) {
-    return yield* Effect27.fail(new Error("Could not extract defineHttp config from source"));
-  }
-  const targetExport = input.exportName ?? "default";
-  const fn13 = configs.find((c2) => c2.exportName === targetExport) ?? configs[0];
-  const config = fn13.config;
-  const handlerName = fn13.exportName;
-  const tagCtx = {
-    project: input.project,
-    stage: resolveStage(input.stage),
-    handler: handlerName
-  };
-  yield* Effect27.logDebug(`Deploying ${handlerName} to ${input.region} (${tagCtx.project}/${tagCtx.stage})`);
-  const { layerArn, external } = yield* ensureLayerAndExternal({
-    project: input.project,
-    stage: tagCtx.stage,
-    region: input.region,
-    packageDir: input.packageDir ?? input.projectDir
-  });
-  const { functionArn } = yield* deployLambda({
-    input,
-    fn: fn13,
-    ...layerArn ? { layerArn } : {},
-    ...external.length > 0 ? { external } : {}
-  });
-  yield* Effect27.logDebug("Setting up API Gateway...");
-  const { apiId } = yield* ensureProjectApi({
-    projectName: input.project,
-    stage: tagCtx.stage,
-    region: input.region,
-    tags: makeTags(tagCtx, "api-gateway")
-  });
-  const { apiUrl } = yield* addRouteToApi({
-    apiId,
-    region: input.region,
-    functionArn,
-    method: config.method,
-    path: config.path
-  });
-  yield* Effect27.logDebug(`Deployment complete! URL: ${apiUrl}`);
-  return {
-    exportName: fn13.exportName,
-    url: apiUrl,
-    functionArn
-  };
-}).pipe(
-  Effect27.provide(
-    clients_exports.makeClients({
-      lambda: { region: input.region },
-      iam: { region: input.region },
-      apigatewayv2: { region: input.region }
-    })
-  )
-);
-var deployAll = (input) => Effect27.gen(function* () {
-  const source = yield* readSource(input);
-  const functions = extractConfigs(source);
-  if (functions.length === 0) {
-    return yield* Effect27.fail(new Error("No defineHttp exports found in source"));
-  }
-  yield* Effect27.logDebug(`Found ${functions.length} HTTP handler(s) to deploy`);
-  const tagCtx = {
-    project: input.project,
-    stage: resolveStage(input.stage),
-    handler: "api"
-  };
-  const { layerArn, external } = yield* ensureLayerAndExternal({
-    project: input.project,
-    stage: tagCtx.stage,
-    region: input.region,
-    packageDir: input.packageDir ?? input.projectDir
-  });
-  yield* Effect27.logDebug("Setting up API Gateway...");
-  const { apiId } = yield* ensureProjectApi({
-    projectName: input.project,
-    stage: tagCtx.stage,
-    region: input.region,
-    tags: makeTags(tagCtx, "api-gateway")
-  });
-  const apiUrl = `https://${apiId}.execute-api.${input.region}.amazonaws.com`;
-  const results = [];
-  const activeRouteKeys = /* @__PURE__ */ new Set();
-  for (const fn13 of functions) {
-    const { exportName, functionArn, config, handlerName: fnName } = yield* deployLambda({
-      input,
-      fn: fn13,
-      ...layerArn ? { layerArn } : {},
-      ...external.length > 0 ? { external } : {}
-    });
-    const routeKey = `${config.method} ${config.path}`;
-    activeRouteKeys.add(routeKey);
-    const { apiUrl: handlerUrl } = yield* addRouteToApi({
-      apiId,
-      region: input.region,
-      functionArn,
-      method: config.method,
-      path: config.path
-    });
-    results.push({ exportName, url: handlerUrl, functionArn });
-    yield* Effect27.logDebug(`  ${config.method} ${config.path} \u2192 ${fn13.exportName}`);
-  }
-  yield* removeStaleRoutes(apiId, activeRouteKeys);
-  yield* Effect27.logDebug(`Deployment complete! API: ${apiUrl}`);
-  return {
-    apiId,
-    apiUrl,
-    handlers: results
-  };
-}).pipe(
-  Effect27.provide(
-    clients_exports.makeClients({
-      lambda: { region: input.region },
-      iam: { region: input.region },
-      apigatewayv2: { region: input.region }
-    })
-  )
-);
-
 // src/deploy/deploy-table.ts
-import { Effect as Effect28 } from "effect";
 var TABLE_DEFAULT_PERMISSIONS = ["dynamodb:*", "logs:*"];
-var deployTableFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsPermissions, staticGlobs }) => Effect28.gen(function* () {
+var deployTableFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsPermissions, staticGlobs }) => Effect27.gen(function* () {
   const { exportName, config } = fn13;
   const handlerName = exportName;
   const tagCtx = {
@@ -4808,7 +4535,7 @@ var deployTableFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsP
     stage: resolveStage(input.stage),
     handler: handlerName
   };
-  yield* Effect28.logDebug("Creating DynamoDB table...");
+  yield* Effect27.logDebug("Creating DynamoDB table...");
   const tableName = `${input.project}-${tagCtx.stage}-${handlerName}`;
   const { tableArn, streamArn } = yield* ensureTable({
     name: tableName,
@@ -4832,7 +4559,7 @@ var deployTableFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsP
     ...depsPermissions ? { depsPermissions } : {},
     ...staticGlobs && staticGlobs.length > 0 ? { staticGlobs } : {}
   });
-  yield* Effect28.logDebug("Setting up event source mapping...");
+  yield* Effect27.logDebug("Setting up event source mapping...");
   yield* ensureEventSourceMapping({
     functionArn,
     streamArn,
@@ -4840,7 +4567,7 @@ var deployTableFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsP
     batchWindow: config.batchWindow ?? 2,
     startingPosition: config.startingPosition ?? "LATEST"
   });
-  yield* Effect28.logDebug(`Table deployment complete! Table: ${tableArn}`);
+  yield* Effect27.logDebug(`Table deployment complete! Table: ${tableArn}`);
   return {
     exportName,
     functionArn,
@@ -4849,11 +4576,11 @@ var deployTableFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsP
     streamArn
   };
 });
-var deployTable = (input) => Effect28.gen(function* () {
+var deployTable = (input) => Effect27.gen(function* () {
   const source = yield* readSource(input);
   const configs = extractTableConfigs(source);
   if (configs.length === 0) {
-    return yield* Effect28.fail(new Error("No defineTable exports found in source"));
+    return yield* Effect27.fail(new Error("No defineTable exports found in source"));
   }
   const targetExport = input.exportName ?? "default";
   const fn13 = configs.find((c2) => c2.exportName === targetExport) ?? configs[0];
@@ -4871,7 +4598,7 @@ var deployTable = (input) => Effect28.gen(function* () {
   });
   return result;
 }).pipe(
-  Effect28.provide(
+  Effect27.provide(
     clients_exports.makeClients({
       lambda: { region: input.region },
       iam: { region: input.region },
@@ -4879,20 +4606,20 @@ var deployTable = (input) => Effect28.gen(function* () {
     })
   )
 );
-var deployAllTables = (input) => Effect28.gen(function* () {
+var deployAllTables = (input) => Effect27.gen(function* () {
   const source = yield* readSource(input);
   const functions = extractTableConfigs(source);
   if (functions.length === 0) {
-    return yield* Effect28.fail(new Error("No defineTable exports found in source"));
+    return yield* Effect27.fail(new Error("No defineTable exports found in source"));
   }
-  yield* Effect28.logDebug(`Found ${functions.length} table handler(s) to deploy`);
+  yield* Effect27.logDebug(`Found ${functions.length} table handler(s) to deploy`);
   const { layerArn, external } = yield* ensureLayerAndExternal({
     project: input.project,
     stage: resolveStage(input.stage),
     region: input.region,
     packageDir: input.packageDir ?? input.projectDir
   });
-  const results = yield* Effect28.forEach(
+  const results = yield* Effect27.forEach(
     functions,
     (fn13) => deployTableFunction({
       input,
@@ -4904,7 +4631,7 @@ var deployAllTables = (input) => Effect28.gen(function* () {
   );
   return results;
 }).pipe(
-  Effect28.provide(
+  Effect27.provide(
     clients_exports.makeClients({
       lambda: { region: input.region },
       iam: { region: input.region },
@@ -4913,6 +4640,72 @@ var deployAllTables = (input) => Effect28.gen(function* () {
   )
 );
 
+// src/deploy/deploy-api.ts
+import { Effect as Effect28 } from "effect";
+var deployApiFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsPermissions, staticGlobs }) => Effect28.gen(function* () {
+  const { exportName, config } = fn13;
+  const handlerName = exportName;
+  const { functionArn, status } = yield* deployCoreLambda({
+    input,
+    exportName,
+    handlerName,
+    bundleType: "api",
+    ...config.permissions ? { permissions: config.permissions } : {},
+    ...config.memory ? { memory: config.memory } : {},
+    ...config.timeout ? { timeout: config.timeout } : {},
+    ...layerArn ? { layerArn } : {},
+    ...external ? { external } : {},
+    ...depsEnv ? { depsEnv } : {},
+    ...depsPermissions ? { depsPermissions } : {},
+    ...staticGlobs && staticGlobs.length > 0 ? { staticGlobs } : {}
+  });
+  return { exportName, functionArn, status, config, handlerName };
+});
+var deploy = (input) => Effect28.gen(function* () {
+  const source = yield* readSource(input);
+  const configs = extractApiConfigs(source);
+  if (configs.length === 0) {
+    return yield* Effect28.fail(new Error("Could not extract defineApi config from source"));
+  }
+  const targetExport = input.exportName ?? "default";
+  const fn13 = configs.find((c2) => c2.exportName === targetExport) ?? configs[0];
+  const handlerName = fn13.exportName;
+  const tagCtx = {
+    project: input.project,
+    stage: resolveStage(input.stage),
+    handler: handlerName
+  };
+  yield* Effect28.logDebug(`Deploying API handler ${handlerName} to ${input.region}`);
+  const { layerArn, external } = yield* ensureLayerAndExternal({
+    project: input.project,
+    stage: tagCtx.stage,
+    region: input.region,
+    packageDir: input.packageDir ?? input.projectDir
+  });
+  const { functionArn } = yield* deployApiFunction({
+    input,
+    fn: fn13,
+    ...layerArn ? { layerArn } : {},
+    ...external.length > 0 ? { external } : {}
+  });
+  const lambdaName = `${input.project}-${tagCtx.stage}-${handlerName}`;
+  const { functionUrl } = yield* ensureFunctionUrl(lambdaName);
+  yield* addFunctionUrlPublicAccess(lambdaName);
+  yield* Effect28.logDebug(`Deployment complete! URL: ${functionUrl}`);
+  return {
+    exportName: fn13.exportName,
+    url: functionUrl,
+    functionArn
+  };
+}).pipe(
+  Effect28.provide(
+    clients_exports.makeClients({
+      lambda: { region: input.region },
+      iam: { region: input.region }
+    })
+  )
+);
+
 // src/deploy/deploy-app.ts
 import { Effect as Effect29 } from "effect";
 import { execSync } from "child_process";
@@ -4927,7 +4720,7 @@ var deployApp = (input) => Effect29.gen(function* () {
   if (routePatterns.length > 0 && !input.apiOriginDomain) {
     return yield* Effect29.fail(
       new Error(
-        `App "${exportName}" has routes but no API Gateway exists. Ensure defineHttp() or defineApi() handlers are included in the discovery patterns.`
+        `App "${exportName}" has routes but no API handler was deployed. Ensure defineApi() handlers are included in the discovery patterns.`
       )
     );
   }
@@ -5119,7 +4912,7 @@ var deployStaticSite = (input) => Effect30.gen(function* () {
   if (routePatterns.length > 0 && !input.apiOriginDomain) {
     return yield* Effect30.fail(
       new Error(
-        `Static site "${exportName}" has routes but no API Gateway exists. Ensure defineHttp() handlers are included in the discovery patterns.`
+        `Static site "${exportName}" has routes but no API handler was deployed. Ensure defineApi() handlers are included in the discovery patterns.`
       )
     );
   }
@@ -5397,28 +5190,6 @@ var deployMailer = ({ project, stage, region, fn: fn13 }) => Effect33.gen(functi
   };
 });
 
-// src/deploy/deploy-api.ts
-import { Effect as Effect34 } from "effect";
-var deployApiFunction = ({ input, fn: fn13, layerArn, external, depsEnv, depsPermissions, staticGlobs }) => Effect34.gen(function* () {
-  const { exportName, config } = fn13;
-  const handlerName = exportName;
-  const { functionArn, status } = yield* deployCoreLambda({
-    input,
-    exportName,
-    handlerName,
-    bundleType: "api",
-    ...config.permissions ? { permissions: config.permissions } : {},
-    ...config.memory ? { memory: config.memory } : {},
-    ...config.timeout ? { timeout: config.timeout } : {},
-    ...layerArn ? { layerArn } : {},
-    ...external ? { external } : {},
-    ...depsEnv ? { depsEnv } : {},
-    ...depsPermissions ? { depsPermissions } : {},
-    ...staticGlobs && staticGlobs.length > 0 ? { staticGlobs } : {}
-  });
-  return { exportName, functionArn, status, config, handlerName };
-});
-
 // src/deploy/deploy.ts
 var statusLabel = (status) => {
   switch (status) {
@@ -5460,7 +5231,7 @@ var createLiveProgress = (manifest) => {
     const sec = ((Date.now() - startTime) / 1e3).toFixed(1);
     return c.dim(`${sec}s`);
   };
-  return (name, type, status) => Effect35.sync(() => {
+  return (name, type, status) => Effect34.sync(() => {
     const key = `${name}:${type}`;
     results.set(key, status);
     const line = `  ${name} ${c.dim(`(${type})`)} ${statusLabel(status)} ${formatDuration()}`;
@@ -5478,27 +5249,27 @@ var createLiveProgress = (manifest) => {
   });
 };
 var DEPLOY_CONCURRENCY = 5;
-var prepareLayer = (input) => Effect35.gen(function* () {
+var prepareLayer = (input) => Effect34.gen(function* () {
   const layerResult = yield* ensureLayer({
     project: input.project,
     stage: input.stage,
     region: input.region,
     projectDir: input.packageDir
   }).pipe(
-    Effect35.provide(
+    Effect34.provide(
       clients_exports.makeClients({
         lambda: { region: input.region }
       })
     )
   );
   const prodDeps = layerResult ? yield* readProductionDependencies(input.packageDir) : [];
-  const { packages: external, warnings: layerWarnings } = prodDeps.length > 0 ? yield* Effect35.sync(() => collectLayerPackages(input.packageDir, prodDeps)) : { packages: [], warnings: [] };
+  const { packages: external, warnings: layerWarnings } = prodDeps.length > 0 ? yield* Effect34.sync(() => collectLayerPackages(input.packageDir, prodDeps)) : { packages: [], warnings: [] };
   for (const warning of layerWarnings) {
-    yield* Effect35.logWarning(`[layer] ${warning}`);
+    yield* Effect34.logWarning(`[layer] ${warning}`);
   }
-  yield* Effect35.logDebug(`Layer result: ${layerResult ? "exists" : "null"}, external packages: ${external.length}`);
+  yield* Effect34.logDebug(`Layer result: ${layerResult ? "exists" : "null"}, external packages: ${external.length}`);
   if (external.length > 0) {
-    yield* Effect35.logDebug(`Bundling with ${external.length} external packages from layer`);
+    yield* Effect34.logDebug(`Bundling with ${external.length} external packages from layer`);
   }
   return {
     layerArn: layerResult?.layerVersionArn,
@@ -5559,7 +5330,6 @@ var buildBucketNameMap = (bucketHandlers, project, stage) => {
 var validateDeps = (discovered, tableNameMap, bucketNameMap, mailerDomainMap) => {
   const errors = [];
   const allGroups = [
-    ...discovered.httpHandlers,
     ...discovered.apiHandlers,
     ...discovered.tableHandlers,
     ...discovered.fifoQueueHandlers,
@@ -5649,45 +5419,13 @@ var resolveHandlerEnv = (depsKeys, paramEntries, ctx) => {
     depsPermissions: resolved?.depsPermissions ?? []
   };
 };
-var buildHttpTasks = (ctx, handlers, apiId, results) => {
-  const tasks = [];
-  const { region } = ctx.input;
-  for (const { file, exports } of handlers) {
-    for (const fn13 of exports) {
-      tasks.push(
-        Effect35.gen(function* () {
-          const env = resolveHandlerEnv(fn13.depsKeys, fn13.paramEntries, ctx);
-          const { exportName, functionArn, status, config, handlerName } = yield* deployLambda({
-            input: makeDeployInput(ctx, file),
-            fn: fn13,
-            ...ctx.layerArn ? { layerArn: ctx.layerArn } : {},
-            ...ctx.external.length > 0 ? { external: ctx.external } : {},
-            depsEnv: env.depsEnv,
-            depsPermissions: env.depsPermissions,
-            ...fn13.staticGlobs.length > 0 ? { staticGlobs: fn13.staticGlobs } : {}
-          }).pipe(Effect35.provide(clients_exports.makeClients({ lambda: { region }, iam: { region } })));
-          const { apiUrl: handlerUrl } = yield* addRouteToApi({
-            apiId,
-            region,
-            functionArn,
-            method: config.method,
-            path: config.path
-          }).pipe(Effect35.provide(clients_exports.makeClients({ lambda: { region }, apigatewayv2: { region } })));
-          results.push({ exportName, url: handlerUrl, functionArn });
-          yield* ctx.logComplete(exportName, "http", status);
-        })
-      );
-    }
-  }
-  return tasks;
-};
 var buildTableTasks = (ctx, handlers, results) => {
   const tasks = [];
   const { region } = ctx.input;
   for (const { file, exports } of handlers) {
     for (const fn13 of exports) {
       tasks.push(
-        Effect35.gen(function* () {
+        Effect34.gen(function* () {
           const env = resolveHandlerEnv(fn13.depsKeys, fn13.paramEntries, ctx);
           const result = yield* deployTableFunction({
             input: makeDeployInput(ctx, file),
@@ -5697,7 +5435,7 @@ var buildTableTasks = (ctx, handlers, results) => {
             depsEnv: env.depsEnv,
             depsPermissions: env.depsPermissions,
             ...fn13.staticGlobs.length > 0 ? { staticGlobs: fn13.staticGlobs } : {}
-          }).pipe(Effect35.provide(clients_exports.makeClients({ lambda: { region }, iam: { region }, dynamodb: { region } })));
+          }).pipe(Effect34.provide(clients_exports.makeClients({ lambda: { region }, iam: { region }, dynamodb: { region } })));
           results.push(result);
           yield* ctx.logComplete(fn13.exportName, "table", result.status);
         })
@@ -5706,14 +5444,13 @@ var buildTableTasks = (ctx, handlers, results) => {
   }
   return tasks;
 };
-var buildAppTasks = (ctx, handlers, results, apiId) => {
+var buildAppTasks = (ctx, handlers, results, apiOriginDomain) => {
   const tasks = [];
   const { region } = ctx.input;
-  const apiOriginDomain = apiId ? `${apiId}.execute-api.${region}.amazonaws.com` : void 0;
   for (const { exports } of handlers) {
     for (const fn13 of exports) {
       tasks.push(
-        Effect35.gen(function* () {
+        Effect34.gen(function* () {
           const result = yield* deployApp({
             projectDir: ctx.input.projectDir,
             project: ctx.input.project,
@@ -5722,7 +5459,7 @@ var buildAppTasks = (ctx, handlers, results, apiId) => {
             fn: fn13,
             verbose: ctx.input.verbose,
             ...apiOriginDomain ? { apiOriginDomain } : {}
-          }).pipe(Effect35.provide(clients_exports.makeClients({
+          }).pipe(Effect34.provide(clients_exports.makeClients({
             lambda: { region },
             iam: { region },
             s3: { region },
@@ -5738,14 +5475,13 @@ var buildAppTasks = (ctx, handlers, results, apiId) => {
   }
   return tasks;
 };
-var buildStaticSiteTasks = (ctx, handlers, results, apiId) => {
+var buildStaticSiteTasks = (ctx, handlers, results, apiOriginDomain) => {
   const tasks = [];
   const { region } = ctx.input;
-  const apiOriginDomain = apiId ? `${apiId}.execute-api.${region}.amazonaws.com` : void 0;
   for (const { file, exports } of handlers) {
     for (const fn13 of exports) {
       tasks.push(
-        Effect35.gen(function* () {
+        Effect34.gen(function* () {
           const result = yield* deployStaticSite({
             projectDir: ctx.input.projectDir,
             project: ctx.input.project,
@@ -5755,7 +5491,7 @@ var buildStaticSiteTasks = (ctx, handlers, results, apiId) => {
             verbose: ctx.input.verbose,
             ...fn13.hasHandler ? { file } : {},
             ...apiOriginDomain ? { apiOriginDomain } : {}
-          }).pipe(Effect35.provide(clients_exports.makeClients({
+          }).pipe(Effect34.provide(clients_exports.makeClients({
             s3: { region },
             cloudfront: { region: "us-east-1" },
             resource_groups_tagging_api: { region: "us-east-1" },
@@ -5775,7 +5511,7 @@ var buildFifoQueueTasks = (ctx, handlers, results) => {
   for (const { file, exports } of handlers) {
     for (const fn13 of exports) {
       tasks.push(
-        Effect35.gen(function* () {
+        Effect34.gen(function* () {
           const env = resolveHandlerEnv(fn13.depsKeys, fn13.paramEntries, ctx);
           const result = yield* deployFifoQueueFunction({
             input: makeDeployInput(ctx, file),
@@ -5785,7 +5521,7 @@ var buildFifoQueueTasks = (ctx, handlers, results) => {
             depsEnv: env.depsEnv,
             depsPermissions: env.depsPermissions,
             ...fn13.staticGlobs.length > 0 ? { staticGlobs: fn13.staticGlobs } : {}
-          }).pipe(Effect35.provide(clients_exports.makeClients({ lambda: { region }, iam: { region }, sqs: { region } })));
+          }).pipe(Effect34.provide(clients_exports.makeClients({ lambda: { region }, iam: { region }, sqs: { region } })));
           results.push(result);
           yield* ctx.logComplete(fn13.exportName, "queue", result.status);
         })
@@ -5800,7 +5536,7 @@ var buildBucketTasks = (ctx, handlers, results) => {
   for (const { file, exports } of handlers) {
     for (const fn13 of exports) {
       tasks.push(
-        Effect35.gen(function* () {
+        Effect34.gen(function* () {
           const env = resolveHandlerEnv(fn13.depsKeys, fn13.paramEntries, ctx);
           const result = yield* deployBucketFunction({
             input: makeDeployInput(ctx, file),
@@ -5810,7 +5546,7 @@ var buildBucketTasks = (ctx, handlers, results) => {
             depsEnv: env.depsEnv,
             depsPermissions: env.depsPermissions,
             ...fn13.staticGlobs.length > 0 ? { staticGlobs: fn13.staticGlobs } : {}
-          }).pipe(Effect35.provide(clients_exports.makeClients({ lambda: { region }, iam: { region }, s3: { region } })));
+          }).pipe(Effect34.provide(clients_exports.makeClients({ lambda: { region }, iam: { region }, s3: { region } })));
           results.push(result);
           const status = result.status === "resource-only" ? "created" : result.status;
           yield* ctx.logComplete(fn13.exportName, "bucket", status);
@@ -5826,13 +5562,13 @@ var buildMailerTasks = (ctx, handlers, results) => {
   for (const { exports } of handlers) {
     for (const fn13 of exports) {
       tasks.push(
-        Effect35.gen(function* () {
+        Effect34.gen(function* () {
           const result = yield* deployMailer({
             project: ctx.input.project,
             stage: ctx.input.stage,
             region,
             fn: fn13
-          }).pipe(Effect35.provide(clients_exports.makeClients({ sesv2: { region } })));
+          }).pipe(Effect34.provide(clients_exports.makeClients({ sesv2: { region } })));
           results.push(result);
           yield* ctx.logComplete(fn13.exportName, "mailer", result.verified ? "unchanged" : "created");
         })
@@ -5841,15 +5577,15 @@ var buildMailerTasks = (ctx, handlers, results) => {
   }
   return tasks;
 };
-var buildApiTasks = (ctx, handlers, apiId, results) => {
+var buildApiTasks = (ctx, handlers, results) => {
   const tasks = [];
   const { region } = ctx.input;
   for (const { file, exports } of handlers) {
     for (const fn13 of exports) {
       tasks.push(
-        Effect35.gen(function* () {
+        Effect34.gen(function* () {
           const env = resolveHandlerEnv(fn13.depsKeys, fn13.paramEntries, ctx);
-          const { exportName, functionArn, status, config } = yield* deployApiFunction({
+          const { exportName, functionArn, status, handlerName } = yield* deployApiFunction({
             input: makeDeployInput(ctx, file),
             fn: fn13,
             ...ctx.layerArn ? { layerArn: ctx.layerArn } : {},
@@ -5857,22 +5593,15 @@ var buildApiTasks = (ctx, handlers, apiId, results) => {
             depsEnv: env.depsEnv,
             depsPermissions: env.depsPermissions,
             ...fn13.staticGlobs.length > 0 ? { staticGlobs: fn13.staticGlobs } : {}
-          }).pipe(Effect35.provide(clients_exports.makeClients({ lambda: { region }, iam: { region } })));
-          yield* addRouteToApi({
-            apiId,
-            region,
-            functionArn,
-            method: "ANY",
-            path: config.basePath
-          }).pipe(Effect35.provide(clients_exports.makeClients({ lambda: { region }, apigatewayv2: { region } })));
-          const { apiUrl: handlerUrl } = yield* addRouteToApi({
-            apiId,
-            region,
-            functionArn,
-            method: "ANY",
-            path: `${config.basePath}/{proxy+}`
-          }).pipe(Effect35.provide(clients_exports.makeClients({ lambda: { region }, apigatewayv2: { region } })));
-          results.push({ exportName, url: handlerUrl, functionArn });
+          }).pipe(Effect34.provide(clients_exports.makeClients({ lambda: { region }, iam: { region } })));
+          const lambdaName = `${ctx.input.project}-${ctx.stage}-${handlerName}`;
+          const { functionUrl } = yield* ensureFunctionUrl(lambdaName).pipe(
+            Effect34.provide(clients_exports.makeClients({ lambda: { region } }))
+          );
+          yield* addFunctionUrlPublicAccess(lambdaName).pipe(
+            Effect34.provide(clients_exports.makeClients({ lambda: { region } }))
+          );
+          results.push({ exportName, url: functionUrl, functionArn });
           yield* ctx.logComplete(exportName, "api", status);
         })
       );
@@ -5880,15 +5609,14 @@ var buildApiTasks = (ctx, handlers, apiId, results) => {
   }
   return tasks;
 };
-var deployProject = (input) => Effect35.gen(function* () {
+var deployProject = (input) => Effect34.gen(function* () {
   const stage = resolveStage(input.stage);
   const files = findHandlerFiles(input.patterns, input.projectDir);
   if (files.length === 0) {
-    return yield* Effect35.fail(new Error(`No files match patterns: ${input.patterns.join(", ")}`));
+    return yield* Effect34.fail(new Error(`No files match patterns: ${input.patterns.join(", ")}`));
   }
-  yield* Effect35.logDebug(`Found ${files.length} file(s) matching patterns`);
-  const { httpHandlers, tableHandlers, appHandlers, staticSiteHandlers, fifoQueueHandlers, bucketHandlers, mailerHandlers, apiHandlers } = discoverHandlers(files);
-  const totalHttpHandlers = httpHandlers.reduce((acc, h) => acc + h.exports.length, 0);
+  yield* Effect34.logDebug(`Found ${files.length} file(s) matching patterns`);
+  const { tableHandlers, appHandlers, staticSiteHandlers, fifoQueueHandlers, bucketHandlers, mailerHandlers, apiHandlers } = discoverHandlers(files);
   const totalTableHandlers = tableHandlers.reduce((acc, h) => acc + h.exports.length, 0);
   const totalAppHandlers = appHandlers.reduce((acc, h) => acc + h.exports.length, 0);
   const totalStaticSiteHandlers = input.noSites ? 0 : staticSiteHandlers.reduce((acc, h) => acc + h.exports.length, 0);
@@ -5896,12 +5624,11 @@ var deployProject = (input) => Effect35.gen(function* () {
   const totalBucketHandlers = bucketHandlers.reduce((acc, h) => acc + h.exports.length, 0);
   const totalMailerHandlers = mailerHandlers.reduce((acc, h) => acc + h.exports.length, 0);
   const totalApiHandlers = apiHandlers.reduce((acc, h) => acc + h.exports.length, 0);
-  const totalAllHandlers = totalHttpHandlers + totalTableHandlers + totalAppHandlers + totalStaticSiteHandlers + totalFifoQueueHandlers + totalBucketHandlers + totalMailerHandlers + totalApiHandlers;
+  const totalAllHandlers = totalTableHandlers + totalAppHandlers + totalStaticSiteHandlers + totalFifoQueueHandlers + totalBucketHandlers + totalMailerHandlers + totalApiHandlers;
   if (totalAllHandlers === 0) {
-    return yield* Effect35.fail(new Error("No handlers found in matched files"));
+    return yield* Effect34.fail(new Error("No handlers found in matched files"));
   }
   const parts = [];
-  if (totalHttpHandlers > 0) parts.push(`${totalHttpHandlers} http`);
   if (totalTableHandlers > 0) parts.push(`${totalTableHandlers} table`);
   if (totalAppHandlers > 0) parts.push(`${totalAppHandlers} app`);
   if (totalStaticSiteHandlers > 0) parts.push(`${totalStaticSiteHandlers} site`);
@@ -5911,11 +5638,11 @@ var deployProject = (input) => Effect35.gen(function* () {
   if (totalApiHandlers > 0) parts.push(`${totalApiHandlers} api`);
   yield* Console2.log(`
   ${c.dim("Handlers:")} ${parts.join(", ")}`);
-  const discovered = { httpHandlers, tableHandlers, appHandlers, staticSiteHandlers, fifoQueueHandlers, bucketHandlers, mailerHandlers, apiHandlers };
+  const discovered = { tableHandlers, appHandlers, staticSiteHandlers, fifoQueueHandlers, bucketHandlers, mailerHandlers, apiHandlers };
   const requiredParams = collectRequiredParams(discovered, input.project, stage);
   if (requiredParams.length > 0) {
     const { missing } = yield* checkMissingParams(requiredParams).pipe(
-      Effect35.provide(clients_exports.makeClients({ ssm: { region: input.region } }))
+      Effect34.provide(clients_exports.makeClients({ ssm: { region: input.region } }))
     );
     if (missing.length > 0) {
       yield* Console2.log(`
@@ -5937,7 +5664,7 @@ var deployProject = (input) => Effect35.gen(function* () {
     for (const err of depsErrors) {
       yield* Console2.log(`  ${c.red("\u2717")} ${err}`);
     }
-    return yield* Effect35.fail(new Error("Unresolved deps \u2014 aborting deploy"));
+    return yield* Effect34.fail(new Error("Unresolved deps \u2014 aborting deploy"));
   }
   const { layerArn, layerVersion, layerStatus, external } = yield* prepareLayer({
     project: input.project,
@@ -5949,40 +5676,8 @@ var deployProject = (input) => Effect35.gen(function* () {
     const status = layerStatus === "cached" ? c.dim("cached") : c.green("created");
     yield* Console2.log(`  ${c.dim("Layer:")} ${status} ${c.dim(`v${layerVersion}`)} (${external.length} packages)`);
   }
-  let apiId;
-  let apiUrl;
-  const staticSitesNeedApi = !input.noSites && staticSiteHandlers.some(
-    ({ exports }) => exports.some((fn13) => fn13.routePatterns.length > 0)
-  );
-  const appsNeedApi = appHandlers.some(
-    ({ exports }) => exports.some((fn13) => fn13.routePatterns.length > 0)
-  );
-  if (totalHttpHandlers > 0 || totalApiHandlers > 0 || staticSitesNeedApi || appsNeedApi) {
-    const tagCtx = {
-      project: input.project,
-      stage,
-      handler: "api"
-    };
-    const api = yield* ensureProjectApi({
-      projectName: input.project,
-      stage: tagCtx.stage,
-      region: input.region,
-      tags: makeTags(tagCtx, "api-gateway")
-    }).pipe(
-      Effect35.provide(
-        clients_exports.makeClients({
-          apigatewayv2: { region: input.region }
-        })
-      )
-    );
-    apiId = api.apiId;
-    apiUrl = `https://${apiId}.execute-api.${input.region}.amazonaws.com`;
-    yield* Console2.log(`  ${c.dim("API Gateway:")} ${apiId}`);
-  }
   yield* Console2.log("");
   const manifest = [];
-  for (const { exports } of httpHandlers)
-    for (const fn13 of exports) manifest.push({ name: fn13.exportName, type: "http" });
   for (const { exports } of tableHandlers)
     for (const fn13 of exports) manifest.push({ name: fn13.exportName, type: "table" });
   for (const { exports } of appHandlers)
@@ -6011,7 +5706,6 @@ var deployProject = (input) => Effect35.gen(function* () {
     mailerDomainMap,
     logComplete
   };
-  const httpResults = [];
   const tableResults = [];
   const appResults = [];
   const staticSiteResults = [];
@@ -6019,53 +5713,55 @@ var deployProject = (input) => Effect35.gen(function* () {
   const bucketResults = [];
   const mailerResults = [];
   const apiResults = [];
-  const tasks = [
-    ...apiId ? buildHttpTasks(ctx, httpHandlers, apiId, httpResults) : [],
-    ...buildTableTasks(ctx, tableHandlers, tableResults),
-    ...buildAppTasks(ctx, appHandlers, appResults, apiId),
-    ...input.noSites ? [] : buildStaticSiteTasks(ctx, staticSiteHandlers, staticSiteResults, apiId),
-    ...buildFifoQueueTasks(ctx, fifoQueueHandlers, fifoQueueResults),
-    ...buildBucketTasks(ctx, bucketHandlers, bucketResults),
-    ...buildMailerTasks(ctx, mailerHandlers, mailerResults),
-    ...apiId ? buildApiTasks(ctx, apiHandlers, apiId, apiResults) : []
-  ];
-  yield* Effect35.all(tasks, { concurrency: DEPLOY_CONCURRENCY, discard: true });
+  const staticSitesNeedApi = !input.noSites && staticSiteHandlers.some(
+    ({ exports }) => exports.some((fn13) => fn13.routePatterns.length > 0)
+  );
+  const appsNeedApi = appHandlers.some(
+    ({ exports }) => exports.some((fn13) => fn13.routePatterns.length > 0)
+  );
+  const needsTwoPhase = (staticSitesNeedApi || appsNeedApi) && totalApiHandlers > 0;
+  if (needsTwoPhase) {
+    const phase1Tasks = [
+      ...buildApiTasks(ctx, apiHandlers, apiResults),
+      ...buildTableTasks(ctx, tableHandlers, tableResults),
+      ...buildFifoQueueTasks(ctx, fifoQueueHandlers, fifoQueueResults),
+      ...buildBucketTasks(ctx, bucketHandlers, bucketResults),
+      ...buildMailerTasks(ctx, mailerHandlers, mailerResults)
+    ];
+    yield* Effect34.all(phase1Tasks, { concurrency: DEPLOY_CONCURRENCY, discard: true });
+    const firstApiUrl = apiResults[0]?.url;
+    const apiOriginDomain = firstApiUrl ? firstApiUrl.replace("https://", "").replace(/\/$/, "") : void 0;
+    const phase2Tasks = [
+      ...buildAppTasks(ctx, appHandlers, appResults, apiOriginDomain),
+      ...input.noSites ? [] : buildStaticSiteTasks(ctx, staticSiteHandlers, staticSiteResults, apiOriginDomain)
+    ];
+    if (phase2Tasks.length > 0) {
+      yield* Effect34.all(phase2Tasks, { concurrency: DEPLOY_CONCURRENCY, discard: true });
+    }
+  } else {
+    const tasks = [
+      ...buildApiTasks(ctx, apiHandlers, apiResults),
+      ...buildTableTasks(ctx, tableHandlers, tableResults),
+      ...buildAppTasks(ctx, appHandlers, appResults),
+      ...input.noSites ? [] : buildStaticSiteTasks(ctx, staticSiteHandlers, staticSiteResults),
+      ...buildFifoQueueTasks(ctx, fifoQueueHandlers, fifoQueueResults),
+      ...buildBucketTasks(ctx, bucketHandlers, bucketResults),
+      ...buildMailerTasks(ctx, mailerHandlers, mailerResults)
+    ];
+    yield* Effect34.all(tasks, { concurrency: DEPLOY_CONCURRENCY, discard: true });
+  }
   if (!input.noSites && staticSiteResults.length > 0 || appResults.length > 0) {
     yield* cleanupOrphanedFunctions(input.project, stage).pipe(
-      Effect35.provide(clients_exports.makeClients({
+      Effect34.provide(clients_exports.makeClients({
         cloudfront: { region: "us-east-1" },
         resource_groups_tagging_api: { region: "us-east-1" }
       })),
-      Effect35.catchAll(
-        (error) => Effect35.logDebug(`CloudFront Function cleanup failed (non-fatal): ${error}`)
-      )
-    );
-  }
-  if (apiId) {
-    const activeRouteKeys = /* @__PURE__ */ new Set();
-    for (const { exports } of httpHandlers) {
-      for (const fn13 of exports) {
-        activeRouteKeys.add(`${fn13.config.method} ${fn13.config.path}`);
-      }
-    }
-    for (const { exports } of apiHandlers) {
-      for (const fn13 of exports) {
-        activeRouteKeys.add(`ANY ${fn13.config.basePath}`);
-        activeRouteKeys.add(`ANY ${fn13.config.basePath}/{proxy+}`);
-      }
-    }
-    yield* removeStaleRoutes(apiId, activeRouteKeys).pipe(
-      Effect35.provide(
-        clients_exports.makeClients({
-          apigatewayv2: { region: input.region }
-        })
+      Effect34.catchAll(
+        (error) => Effect34.logDebug(`CloudFront Function cleanup failed (non-fatal): ${error}`)
       )
     );
   }
-  if (apiUrl) {
-    yield* Effect35.logDebug(`Deployment complete! API: ${apiUrl}`);
-  }
-  return { apiId, apiUrl, httpResults, tableResults, appResults, staticSiteResults, fifoQueueResults, bucketResults, mailerResults, apiResults };
+  return { tableResults, appResults, staticSiteResults, fifoQueueResults, bucketResults, mailerResults, apiResults };
 });
 
 // src/cli/config.ts
@@ -6074,13 +5770,13 @@ import * as path7 from "path";
 import * as fs4 from "fs";
 import { pathToFileURL } from "url";
 import * as esbuild2 from "esbuild";
-import { Effect as Effect36 } from "effect";
-var loadConfig = Effect36.fn("loadConfig")(function* () {
+import { Effect as Effect35 } from "effect";
+var loadConfig = Effect35.fn("loadConfig")(function* () {
   const configPath = path7.resolve(process.cwd(), "effortless.config.ts");
   if (!fs4.existsSync(configPath)) {
     return null;
   }
-  const result = yield* Effect36.tryPromise({
+  const result = yield* Effect35.tryPromise({
     try: () => esbuild2.build({
       entryPoints: [configPath],
       bundle: true,
@@ -6098,10 +5794,10 @@ var loadConfig = Effect36.fn("loadConfig")(function* () {
   const code = output.text;
   const tempFile = path7.join(process.cwd(), ".effortless-config.mjs");
   fs4.writeFileSync(tempFile, code);
-  const mod = yield* Effect36.tryPromise({
+  const mod = yield* Effect35.tryPromise({
     try: () => import(pathToFileURL(tempFile).href),
     catch: (error) => new Error(`Failed to load config: ${error}`)
-  }).pipe(Effect36.ensuring(Effect36.sync(() => fs4.unlinkSync(tempFile))));
+  }).pipe(Effect35.ensuring(Effect35.sync(() => fs4.unlinkSync(tempFile))));
   return mod.default;
 });
 var projectOption = Options.text("project").pipe(
@@ -6152,12 +5848,12 @@ var getPatternsFromConfig = (config) => {
 // src/cli/project-config.ts
 import * as Context13 from "effect/Context";
 import * as Layer14 from "effect/Layer";
-import * as Effect37 from "effect/Effect";
+import * as Effect36 from "effect/Effect";
 import * as path8 from "path";
 var ProjectConfig = class _ProjectConfig extends Context13.Tag("ProjectConfig")() {
   static Live = Layer14.effect(
     _ProjectConfig,
-    Effect37.gen(function* () {
+    Effect36.gen(function* () {
       const config = yield* loadConfig();
       const cwd = process.cwd();
       const projectDir = config?.root ? path8.resolve(cwd, config.root) : cwd;
@@ -6177,7 +5873,7 @@ var isFilePath = (target) => {
 var deployCommand = Command.make(
   "deploy",
   { target: deployTargetArg, project: projectOption, stage: stageOption, region: regionOption, verbose: verboseOption, noSites: noSitesOption },
-  ({ target, project: projectOpt, stage, region, verbose, noSites }) => Effect38.gen(function* () {
+  ({ target, project: projectOpt, stage, region, verbose, noSites }) => Effect37.gen(function* () {
     const { config, cwd, projectDir } = yield* ProjectConfig;
     const project = Option.getOrElse(projectOpt, () => config?.name ?? "");
     const finalStage = config?.stage ?? stage;
@@ -6189,7 +5885,6 @@ var deployCommand = Command.make(
     const clientsLayer = clients_exports.makeClients({
       lambda: { region: finalRegion },
       iam: { region: finalRegion },
-      apigatewayv2: { region: finalRegion },
       dynamodb: { region: finalRegion },
       resource_groups_tagging_api: { region: finalRegion },
       s3: { region: finalRegion },
@@ -6198,7 +5893,7 @@ var deployCommand = Command.make(
     });
     const logLevel = verbose ? LogLevel.Debug : LogLevel.Warning;
     yield* Option.match(target, {
-      onNone: () => Effect38.gen(function* () {
+      onNone: () => Effect37.gen(function* () {
         const patterns = getPatternsFromConfig(config);
         if (!patterns) {
           yield* Console3.error("Error: No target specified and no 'handlers' patterns in config");
@@ -6214,28 +5909,18 @@ var deployCommand = Command.make(
           noSites,
           verbose
         });
-        const total = results.httpResults.length + results.tableResults.length + results.appResults.length + results.staticSiteResults.length + results.apiResults.length;
+        const total = results.tableResults.length + results.appResults.length + results.staticSiteResults.length + results.apiResults.length;
         yield* Console3.log(`
 ${c.green(`Deployed ${total} handler(s):`)}`);
-        if (results.apiUrl) {
-          yield* Console3.log(`
-  API: ${c.cyan(results.apiUrl)}`);
-        }
         const summaryLines = [];
-        for (const r of results.httpResults) {
-          const pathPart = results.apiUrl ? r.url.replace(results.apiUrl, "") : r.url;
-          summaryLines.push({ name: r.exportName, line: `  ${c.cyan("[http]")}  ${c.bold(r.exportName)}  ${c.dim(pathPart)}` });
-        }
         for (const r of results.appResults) {
-          const pathPart = results.apiUrl ? r.url.replace(results.apiUrl, "") : r.url;
-          summaryLines.push({ name: r.exportName, line: `  ${c.cyan("[app]")}   ${c.bold(r.exportName)}  ${c.dim(pathPart)}` });
+          summaryLines.push({ name: r.exportName, line: `  ${c.cyan("[app]")}   ${c.bold(r.exportName)}  ${c.dim(r.url)}` });
         }
         for (const r of results.tableResults) {
           summaryLines.push({ name: r.exportName, line: `  ${c.cyan("[table]")} ${c.bold(r.exportName)}` });
         }
         for (const r of results.apiResults) {
-          const pathPart = results.apiUrl ? r.url.replace(results.apiUrl, "") : r.url;
-          summaryLines.push({ name: r.exportName, line: `  ${c.cyan("[api]")}   ${c.bold(r.exportName)}  ${c.dim(pathPart)}` });
+          summaryLines.push({ name: r.exportName, line: `  ${c.cyan("[api]")}   ${c.bold(r.exportName)}  ${c.dim(r.url)}` });
         }
         for (const r of results.staticSiteResults) {
           summaryLines.push({ name: r.exportName, line: `  ${c.cyan("[site]")}  ${c.bold(r.exportName)}: ${c.cyan(r.url)}` });
@@ -6245,7 +5930,7 @@ ${c.green(`Deployed ${total} handler(s):`)}`);
           yield* Console3.log(line);
         }
       }),
-      onSome: (targetValue) => Effect38.gen(function* () {
+      onSome: (targetValue) => Effect37.gen(function* () {
         if (isFilePath(targetValue)) {
           const fullPath = path9.isAbsolute(targetValue) ? targetValue : path9.resolve(projectDir, targetValue);
           const input = {
@@ -6256,30 +5941,16 @@ ${c.green(`Deployed ${total} handler(s):`)}`);
             stage: finalStage,
             region: finalRegion
           };
-          const httpResult = yield* deployAll(input).pipe(
-            Effect38.catchIf(
-              (e) => e instanceof Error && e.message.includes("No defineHttp"),
-              () => Effect38.succeed(null)
-            )
-          );
           const tableResults = yield* deployAllTables(input).pipe(
-            Effect38.catchIf(
+            Effect37.catchIf(
               (e) => e instanceof Error && e.message.includes("No defineTable"),
-              () => Effect38.succeed([])
+              () => Effect37.succeed([])
             )
           );
-          if (!httpResult && tableResults.length === 0) {
+          if (tableResults.length === 0) {
             yield* Console3.error("No handlers found in file");
             return;
           }
-          if (httpResult) {
-            yield* Console3.log(`
-API Gateway: ${c.cyan(httpResult.apiUrl)}`);
-            yield* Console3.log(c.green(`Deployed ${httpResult.handlers.length} HTTP handler(s):`));
-            for (const r of httpResult.handlers) {
-              yield* Console3.log(`  ${c.bold(r.exportName)}: ${c.cyan(r.url)}`);
-            }
-          }
           if (tableResults.length > 0) {
             yield* Console3.log(c.green(`
 Deployed ${tableResults.length} table handler(s):`));
@@ -6330,25 +6001,21 @@ ${c.green("Deployed:")} ${c.cyan(result.url)}`);
         }
       })
     }).pipe(
-      Effect38.provide(clientsLayer),
+      Effect37.provide(clientsLayer),
       Logger.withMinimumLogLevel(logLevel)
     );
-  }).pipe(Effect38.provide(ProjectConfig.Live))
+  }).pipe(Effect37.provide(ProjectConfig.Live))
 ).pipe(Command.withDescription("Deploy handlers to AWS Lambda. Accepts a handler name, file path, or deploys all from config"));
 
 // src/cli/commands/status.ts
 import { Command as Command2 } from "@effect/cli";
-import { Effect as Effect39, Console as Console4, Logger as Logger2, LogLevel as LogLevel2, Option as Option2 } from "effect";
-var { lambda, apigatewayv2: apigateway } = clients_exports;
+import { Effect as Effect38, Console as Console4, Logger as Logger2, LogLevel as LogLevel2, Option as Option2 } from "effect";
+var { lambda } = clients_exports;
 var INTERNAL_HANDLERS = /* @__PURE__ */ new Set(["api", "platform"]);
 var extractFunctionName = (arn) => {
   const match = arn.match(/:function:([^:]+)$/);
   return match?.[1];
 };
-var extractApiId = (arn) => {
-  const match = arn.match(/\/apis\/([a-z0-9]+)$/);
-  return match?.[1];
-};
 var formatDate = (date) => {
   if (!date) return "";
   const d = typeof date === "string" ? new Date(date) : date;
@@ -6363,7 +6030,7 @@ var formatDate = (date) => {
   if (days < 7) return `${days}d ago`;
   return d.toLocaleDateString("en-US", { month: "short", day: "numeric" });
 };
-var getLambdaDetails = (functionName) => Effect39.gen(function* () {
+var getLambdaDetails = (functionName) => Effect38.gen(function* () {
   const config = yield* lambda.make("get_function_configuration", {
     FunctionName: functionName
   });
@@ -6373,13 +6040,7 @@ var getLambdaDetails = (functionName) => Effect39.gen(function* () {
     timeout: config.Timeout
   };
 }).pipe(
-  Effect39.catchAll(() => Effect39.succeed({}))
-);
-var getApiUrl = (apiId) => Effect39.gen(function* () {
-  const api = yield* apigateway.make("get_api", { ApiId: apiId });
-  return api.ApiEndpoint;
-}).pipe(
-  Effect39.catchAll(() => Effect39.succeed(void 0))
+  Effect38.catchAll(() => Effect38.succeed({}))
 );
 var discoverCodeHandlers = (projectDir, patterns) => {
   const files = findHandlerFiles(patterns, projectDir);
@@ -6397,22 +6058,17 @@ var discoverAwsHandlers = (resources) => {
     const lambdaResource = handlerResources.find(
       (r) => r.Tags?.find((t) => t.Key === "effortless:type" && t.Value === "lambda")
     );
-    const apiResource = handlerResources.find(
-      (r) => r.Tags?.find((t) => t.Key === "effortless:type" && t.Value === "api-gateway")
-    );
     const typeTag = handlerResources[0]?.Tags?.find((t) => t.Key === "effortless:type");
     const type = typeTag?.Value ?? "unknown";
     handlers.push({
       name,
       type,
-      lambdaArn: lambdaResource?.ResourceARN ?? void 0,
-      apiArn: apiResource?.ResourceARN ?? void 0
+      lambdaArn: lambdaResource?.ResourceARN ?? void 0
     });
   }
   return handlers;
 };
 var TYPE_LABELS = {
-  http: "http",
   table: "table",
   app: "app",
   api: "api",
@@ -6460,7 +6116,7 @@ var formatEntry = (entry) => {
 var statusCommand = Command2.make(
   "status",
   { project: projectOption, stage: stageOption, region: regionOption, verbose: verboseOption },
-  ({ project: projectOpt, stage, region, verbose }) => Effect39.gen(function* () {
+  ({ project: projectOpt, stage, region, verbose }) => Effect38.gen(function* () {
     const { config, projectDir } = yield* ProjectConfig;
     const project = Option2.getOrElse(projectOpt, () => config?.name ?? "");
     const finalStage = config?.stage ?? stage;
@@ -6471,39 +6127,19 @@ var statusCommand = Command2.make(
     }
     const clientsLayer = clients_exports.makeClients({
       lambda: { region: finalRegion },
-      apigatewayv2: { region: finalRegion },
       resource_groups_tagging_api: { region: finalRegion }
     });
     const logLevel = verbose ? LogLevel2.Debug : LogLevel2.Info;
     const patterns = getPatternsFromConfig(config);
     const codeHandlers = patterns ? discoverCodeHandlers(projectDir, patterns) : [];
     const codeHandlerNames = new Set(codeHandlers.map((h) => h.name));
-    yield* Effect39.gen(function* () {
+    yield* Effect38.gen(function* () {
       yield* Console4.log(`
 Status for ${c.bold(project + "/" + finalStage)}:
 `);
       const resources = yield* getAllResourcesByTags(project, finalStage, finalRegion);
       const awsHandlers = discoverAwsHandlers(resources);
       const awsHandlerNames = new Set(awsHandlers.map((h) => h.name));
-      let apiUrl;
-      for (const handler of awsHandlers) {
-        if (handler.apiArn) {
-          const apiId = extractApiId(handler.apiArn);
-          if (apiId) {
-            apiUrl = yield* getApiUrl(apiId);
-            break;
-          }
-        }
-      }
-      const apiResource = resources.find(
-        (r) => r.Tags?.find((t) => t.Key === "effortless:handler" && t.Value === "api") && r.Tags?.find((t) => t.Key === "effortless:type" && t.Value === "api-gateway")
-      );
-      if (!apiUrl && apiResource?.ResourceARN) {
-        const apiId = extractApiId(apiResource.ResourceARN);
-        if (apiId) {
-          apiUrl = yield* getApiUrl(apiId);
-        }
-      }
       const entries = [];
       for (const handler of codeHandlers) {
         const inAws = awsHandlers.find((h) => h.name === handler.name);
@@ -6559,10 +6195,6 @@ Status for ${c.bold(project + "/" + finalStage)}:
       for (const entry of entries) {
         yield* Console4.log(formatEntry(entry));
       }
-      if (apiUrl) {
-        yield* Console4.log(`
-API: ${c.cyan(apiUrl)}`);
-      }
       const counts = {
         new: entries.filter((e) => e.status === "new").length,
         deployed: entries.filter((e) => e.status === "deployed").length,
@@ -6575,7 +6207,7 @@ API: ${c.cyan(apiUrl)}`);
       yield* Console4.log(`
 Total: ${parts.join(", ")}`);
       const depWarnings = yield* checkDependencyWarnings(projectDir).pipe(
-        Effect39.catchAll(() => Effect39.succeed([]))
+        Effect38.catchAll(() => Effect38.succeed([]))
       );
       if (depWarnings.length > 0) {
         yield* Console4.log("");
@@ -6584,18 +6216,18 @@ Total: ${parts.join(", ")}`);
         }
       }
     }).pipe(
-      Effect39.provide(clientsLayer),
+      Effect38.provide(clientsLayer),
       Logger2.withMinimumLogLevel(logLevel)
     );
-  }).pipe(Effect39.provide(ProjectConfig.Live))
+  }).pipe(Effect38.provide(ProjectConfig.Live))
 ).pipe(Command2.withDescription("Compare local handlers with deployed AWS resources. Shows new, deployed, and orphaned handlers"));
 
 // src/cli/commands/cleanup.ts
 import { Command as Command3, Options as Options2 } from "@effect/cli";
-import { Effect as Effect41, Console as Console5, Logger as Logger3, LogLevel as LogLevel3, Option as Option3 } from "effect";
+import { Effect as Effect40, Console as Console5, Logger as Logger3, LogLevel as LogLevel3, Option as Option3 } from "effect";
 
 // src/deploy/cleanup.ts
-import { Effect as Effect40 } from "effect";
+import { Effect as Effect39 } from "effect";
 var extractResourceName = (arn, type) => {
   switch (type) {
     case "lambda": {
@@ -6638,7 +6270,7 @@ var extractLayerInfo = (arn) => {
     version: parseInt(parts[parts.length - 1] ?? "0", 10)
   };
 };
-var deleteResource = (resource) => Effect40.gen(function* () {
+var deleteResource = (resource) => Effect39.gen(function* () {
   const name = extractResourceName(resource.arn, resource.type);
   switch (resource.type) {
     case "lambda":
@@ -6671,18 +6303,18 @@ var deleteResource = (resource) => Effect40.gen(function* () {
       yield* deleteSesIdentity(name);
       break;
     default:
-      yield* Effect40.logWarning(`Unknown resource type: ${resource.type}, skipping ${resource.arn}`);
+      yield* Effect39.logWarning(`Unknown resource type: ${resource.type}, skipping ${resource.arn}`);
   }
 });
-var deleteResources = (resources) => Effect40.gen(function* () {
+var deleteResources = (resources) => Effect39.gen(function* () {
   const orderedTypes = ["lambda", "api-gateway", "cloudfront-distribution", "sqs", "ses", "dynamodb", "s3-bucket", "lambda-layer", "iam-role"];
   const iamRolesToDelete = /* @__PURE__ */ new Set();
   for (const type of orderedTypes) {
     const resourcesOfType = resources.filter((r) => r.type === type);
     for (const resource of resourcesOfType) {
       yield* deleteResource(resource).pipe(
-        Effect40.catchAll(
-          (error) => Effect40.logError(`Failed to delete ${resource.type} ${resource.arn}: ${error}`)
+        Effect39.catchAll(
+          (error) => Effect39.logError(`Failed to delete ${resource.type} ${resource.arn}: ${error}`)
         )
       );
       if (resource.type === "lambda") {
@@ -6694,8 +6326,8 @@ var deleteResources = (resources) => Effect40.gen(function* () {
   }
   for (const roleName of iamRolesToDelete) {
     yield* deleteRole(roleName).pipe(
-      Effect40.catchAll(
-        (error) => Effect40.logError(`Failed to delete IAM role ${roleName}: ${error}`)
+      Effect39.catchAll(
+        (error) => Effect39.logError(`Failed to delete IAM role ${roleName}: ${error}`)
       )
     );
   }
@@ -6722,7 +6354,7 @@ var orphanedOption = Options2.boolean("orphaned").pipe(
 var cleanupCommand = Command3.make(
   "cleanup",
   { project: projectOption, stage: stageOption, region: regionOption, handler: handlerOption, layer: layerOption, roles: rolesOption, orphaned: orphanedOption, all: cleanupAllOption, dryRun: dryRunOption, verbose: verboseOption },
-  ({ project: projectOpt, stage, region, handler: handlerOpt, layer: cleanupLayer, roles: cleanupRoles, orphaned: cleanupOrphaned, all: deleteAll, dryRun, verbose }) => Effect41.gen(function* () {
+  ({ project: projectOpt, stage, region, handler: handlerOpt, layer: cleanupLayer, roles: cleanupRoles, orphaned: cleanupOrphaned, all: deleteAll, dryRun, verbose }) => Effect40.gen(function* () {
     const { config, projectDir } = yield* ProjectConfig;
     const project = Option3.getOrElse(projectOpt, () => config?.name ?? "");
     const finalStage = config?.stage ?? stage;
@@ -6734,14 +6366,14 @@ var cleanupCommand = Command3.make(
     const logLevel = verbose ? LogLevel3.Debug : LogLevel3.Info;
     if (cleanupLayer) {
       yield* cleanupLayerVersions({ project, region: finalRegion, deleteAll, dryRun }).pipe(
-        Effect41.provide(clients_exports.makeClients({ lambda: { region: finalRegion } })),
+        Effect40.provide(clients_exports.makeClients({ lambda: { region: finalRegion } })),
         Logger3.withMinimumLogLevel(logLevel)
       );
       return;
     }
     if (cleanupRoles) {
       yield* cleanupIamRoles({ project, stage: finalStage, region: finalRegion, deleteAll, dryRun }).pipe(
-        Effect41.provide(clients_exports.makeClients({ iam: { region: finalRegion } })),
+        Effect40.provide(clients_exports.makeClients({ iam: { region: finalRegion } })),
         Logger3.withMinimumLogLevel(logLevel)
       );
       return;
@@ -6756,7 +6388,7 @@ var cleanupCommand = Command3.make(
       s3: { region: finalRegion },
       cloudfront: { region: "us-east-1" }
     });
-    yield* Effect41.gen(function* () {
+    yield* Effect40.gen(function* () {
       yield* Console5.log(`
 Looking for resources in ${c.bold(project + "/" + finalStage)}...
 `);
@@ -6836,12 +6468,12 @@ ${c.yellow("[DRY RUN]")} No resources were deleted.`);
       yield* deleteResources(resourcesToDelete);
       yield* Console5.log(c.green("\nDone!"));
     }).pipe(
-      Effect41.provide(clientsLayer),
+      Effect40.provide(clientsLayer),
       Logger3.withMinimumLogLevel(logLevel)
     );
-  }).pipe(Effect41.provide(ProjectConfig.Live))
+  }).pipe(Effect40.provide(ProjectConfig.Live))
 ).pipe(Command3.withDescription("Delete deployed resources (Lambda, API Gateway, DynamoDB, IAM roles, layers)"));
-var cleanupLayerVersions = (input) => Effect41.gen(function* () {
+var cleanupLayerVersions = (input) => Effect40.gen(function* () {
   const layerName = `${input.project}-deps`;
   yield* Console5.log(`
 Searching for layer versions: ${layerName}
@@ -6873,7 +6505,7 @@ ${c.yellow("[DRY RUN]")} No layers were deleted.`);
   yield* Console5.log(c.green(`
 Deleted ${deleted} layer version(s).`));
 });
-var cleanupIamRoles = (input) => Effect41.gen(function* () {
+var cleanupIamRoles = (input) => Effect40.gen(function* () {
   yield* Console5.log("\nSearching for effortless IAM roles...\n");
   const allRoles = yield* listEffortlessRoles();
   if (allRoles.length === 0) {
@@ -6922,8 +6554,8 @@ ${c.yellow("[DRY RUN]")} No roles were deleted.`);
   yield* Console5.log(c.red("\nDeleting roles..."));
   for (const role of roles) {
     yield* deleteRole(role.name).pipe(
-      Effect41.catchAll(
-        (error) => Effect41.logError(`Failed to delete ${role.name}: ${error}`)
+      Effect40.catchAll(
+        (error) => Effect40.logError(`Failed to delete ${role.name}: ${error}`)
       )
     );
   }
@@ -6932,7 +6564,7 @@ ${c.yellow("[DRY RUN]")} No roles were deleted.`);
 
 // src/cli/commands/logs.ts
 import { Args as Args2, Command as Command4, Options as Options3 } from "@effect/cli";
-import { Effect as Effect42, Console as Console6, Logger as Logger4, LogLevel as LogLevel4, Option as Option4, Schedule as Schedule4 } from "effect";
+import { Effect as Effect41, Console as Console6, Logger as Logger4, LogLevel as LogLevel4, Option as Option4, Schedule as Schedule4 } from "effect";
 var { cloudwatch_logs } = clients_exports;
 var handlerArg = Args2.text({ name: "handler" }).pipe(
   Args2.withDescription("Handler name to show logs for")
@@ -7003,7 +6635,7 @@ var fetchLogs = (logGroupName, startTime, nextToken) => cloudwatch_logs.make("fi
 var logsCommand = Command4.make(
   "logs",
   { handler: handlerArg, project: projectOption, stage: stageOption, region: regionOption, tail: tailOption, since: sinceOption, verbose: verboseOption },
-  ({ handler: handlerName, project: projectOpt, stage, region, tail, since, verbose }) => Effect42.gen(function* () {
+  ({ handler: handlerName, project: projectOpt, stage, region, tail, since, verbose }) => Effect41.gen(function* () {
     const { config, projectDir } = yield* ProjectConfig;
     const project = Option4.getOrElse(projectOpt, () => config?.name ?? "");
     const finalStage = config?.stage ?? stage;
@@ -7034,18 +6666,18 @@ var logsCommand = Command4.make(
       cloudwatch_logs: { region: finalRegion }
     });
     const logLevel = verbose ? LogLevel4.Debug : LogLevel4.Info;
-    yield* Effect42.gen(function* () {
+    yield* Effect41.gen(function* () {
       const durationMs = parseDuration(since);
       let startTime = Date.now() - durationMs;
       yield* Console6.log(`Logs for ${c.bold(handlerName)} ${c.dim(`(${logGroupName})`)}:
 `);
       let hasLogs = false;
       const result = yield* fetchLogs(logGroupName, startTime).pipe(
-        Effect42.catchAll((error) => {
+        Effect41.catchAll((error) => {
           if (error instanceof clients_exports.cloudwatch_logs.CloudWatchLogsError && error.cause.name === "ResourceNotFoundException") {
-            return Effect42.succeed({ events: void 0, nextToken: void 0 });
+            return Effect41.succeed({ events: void 0, nextToken: void 0 });
           }
-          return Effect42.fail(error);
+          return Effect41.fail(error);
         })
       );
       if (result.events && result.events.length > 0) {
@@ -7069,10 +6701,10 @@ var logsCommand = Command4.make(
       if (!hasLogs) {
         yield* Console6.log("Waiting for logs... (Ctrl+C to stop)\n");
       }
-      yield* Effect42.repeat(
-        Effect42.gen(function* () {
+      yield* Effect41.repeat(
+        Effect41.gen(function* () {
           const result2 = yield* fetchLogs(logGroupName, startTime).pipe(
-            Effect42.catchAll(() => Effect42.succeed({ events: void 0, nextToken: void 0 }))
+            Effect41.catchAll(() => Effect41.succeed({ events: void 0, nextToken: void 0 }))
           );
           if (result2.events && result2.events.length > 0) {
             for (const event of result2.events) {
@@ -7090,15 +6722,15 @@ var logsCommand = Command4.make(
         Schedule4.spaced("2 seconds")
       );
     }).pipe(
-      Effect42.provide(clientsLayer),
+      Effect41.provide(clientsLayer),
       Logger4.withMinimumLogLevel(logLevel)
     );
-  }).pipe(Effect42.provide(ProjectConfig.Live))
+  }).pipe(Effect41.provide(ProjectConfig.Live))
 ).pipe(Command4.withDescription("Stream CloudWatch logs for a handler. Supports --tail for live tailing and --since for time range"));
 
 // src/cli/commands/layer.ts
 import { Command as Command5, Options as Options4 } from "@effect/cli";
-import { Effect as Effect43, Console as Console7 } from "effect";
+import { Effect as Effect42, Console as Console7 } from "effect";
 import * as path10 from "path";
 import * as fs5 from "fs";
 var buildOption = Options4.boolean("build").pipe(
@@ -7107,28 +6739,28 @@ var buildOption = Options4.boolean("build").pipe(
 var layerCommand = Command5.make(
   "layer",
   { build: buildOption, output: outputOption, verbose: verboseOption },
-  ({ build: build3, output, verbose }) => Effect43.gen(function* () {
+  ({ build: build3, output, verbose }) => Effect42.gen(function* () {
     const { config, cwd } = yield* ProjectConfig;
     if (build3) {
       yield* buildLayer(cwd, output, verbose);
     } else {
       yield* showLayerInfo(cwd, config?.name, verbose);
     }
-  }).pipe(Effect43.provide(ProjectConfig.Live))
+  }).pipe(Effect42.provide(ProjectConfig.Live))
 ).pipe(Command5.withDescription("Inspect or locally build the shared Lambda dependency layer from package.json"));
-var showLayerInfo = (projectDir, projectName, verbose) => Effect43.gen(function* () {
+var showLayerInfo = (projectDir, projectName, verbose) => Effect42.gen(function* () {
   yield* Console7.log(`
 ${c.bold("=== Layer Packages Preview ===")}
 `);
   const depWarnings = yield* checkDependencyWarnings(projectDir).pipe(
-    Effect43.catchAll(() => Effect43.succeed([]))
+    Effect42.catchAll(() => Effect42.succeed([]))
   );
   for (const w of depWarnings) {
     yield* Console7.log(c.yellow(`  \u26A0 ${w}`));
   }
   if (depWarnings.length > 0) yield* Console7.log("");
   const prodDeps = yield* readProductionDependencies(projectDir).pipe(
-    Effect43.catchAll(() => Effect43.succeed([]))
+    Effect42.catchAll(() => Effect42.succeed([]))
   );
   if (prodDeps.length === 0) {
     yield* Console7.log("No production dependencies found in package.json");
@@ -7140,7 +6772,7 @@ ${c.bold("=== Layer Packages Preview ===")}
     yield* Console7.log(`  ${dep}`);
   }
   const hash = yield* computeLockfileHash(projectDir).pipe(
-    Effect43.catchAll(() => Effect43.succeed(null))
+    Effect42.catchAll(() => Effect42.succeed(null))
   );
   if (hash) {
     yield* Console7.log(`
@@ -7148,7 +6780,7 @@ Lockfile hash: ${hash}`);
   } else {
     yield* Console7.log("\nNo lockfile found (package-lock.json, pnpm-lock.yaml, or yarn.lock)");
   }
-  const { packages: allPackages, warnings: layerWarnings } = yield* Effect43.sync(() => collectLayerPackages(projectDir, prodDeps));
+  const { packages: allPackages, warnings: layerWarnings } = yield* Effect42.sync(() => collectLayerPackages(projectDir, prodDeps));
   if (layerWarnings.length > 0) {
     yield* Console7.log(c.yellow(`
 Warnings (${layerWarnings.length}):`));
@@ -7177,7 +6809,7 @@ Total packages for layer ${c.dim(`(${allPackages.length})`)}:`);
 Layer name: ${projectName}-deps`);
   }
 });
-var buildLayer = (projectDir, output, verbose) => Effect43.gen(function* () {
+var buildLayer = (projectDir, output, verbose) => Effect42.gen(function* () {
   const outputDir = path10.isAbsolute(output) ? output : path10.resolve(projectDir, output);
   const layerDir = path10.join(outputDir, "nodejs", "node_modules");
   const layerRoot = path10.join(outputDir, "nodejs");
@@ -7189,14 +6821,14 @@ var buildLayer = (projectDir, output, verbose) => Effect43.gen(function* () {
 ${c.bold("=== Building Layer Locally ===")}
 `);
   const depWarnings = yield* checkDependencyWarnings(projectDir).pipe(
-    Effect43.catchAll(() => Effect43.succeed([]))
+    Effect42.catchAll(() => Effect42.succeed([]))
   );
   for (const w of depWarnings) {
     yield* Console7.log(c.yellow(`  \u26A0 ${w}`));
   }
   if (depWarnings.length > 0) yield* Console7.log("");
   const prodDeps = yield* readProductionDependencies(projectDir).pipe(
-    Effect43.catchAll(() => Effect43.succeed([]))
+    Effect42.catchAll(() => Effect42.succeed([]))
   );
   if (prodDeps.length === 0) {
     yield* Console7.log("No production dependencies found in package.json");
@@ -7208,11 +6840,11 @@ ${c.bold("=== Building Layer Locally ===")}
     yield* Console7.log(`  ${dep}`);
   }
   const hash = yield* computeLockfileHash(projectDir).pipe(
-    Effect43.catchAll(() => Effect43.succeed("unknown"))
+    Effect42.catchAll(() => Effect42.succeed("unknown"))
   );
   yield* Console7.log(`
 Lockfile hash: ${hash}`);
-  const { packages: allPackages, resolvedPaths, warnings: layerWarnings } = yield* Effect43.sync(() => collectLayerPackages(projectDir, prodDeps));
+  const { packages: allPackages, resolvedPaths, warnings: layerWarnings } = yield* Effect42.sync(() => collectLayerPackages(projectDir, prodDeps));
   if (layerWarnings.length > 0) {
     yield* Console7.log(`
 Warnings (${layerWarnings.length}):`);
@@ -7262,18 +6894,18 @@ To inspect: ls ${layerDir}`);
 // src/cli/commands/config.ts
 import { Args as Args3, Command as Command6 } from "@effect/cli";
 import { Prompt } from "@effect/cli";
-import { Effect as Effect44, Console as Console8, Logger as Logger5, LogLevel as LogLevel5, Option as Option5 } from "effect";
-var loadRequiredParams = (projectOpt, stage, region) => Effect44.gen(function* () {
+import { Effect as Effect43, Console as Console8, Logger as Logger5, LogLevel as LogLevel5, Option as Option5 } from "effect";
+var loadRequiredParams = (projectOpt, stage, region) => Effect43.gen(function* () {
   const { config, projectDir } = yield* ProjectConfig;
   const project = Option5.getOrElse(projectOpt, () => config?.name ?? "");
   if (!project) {
     yield* Console8.error("Error: --project is required (or set 'name' in effortless.config.ts)");
-    return yield* Effect44.fail(new Error("Missing project name"));
+    return yield* Effect43.fail(new Error("Missing project name"));
   }
   const patterns = getPatternsFromConfig(config);
   if (!patterns) {
     yield* Console8.error("Error: No 'handlers' patterns in config");
-    return yield* Effect44.fail(new Error("Missing handler patterns"));
+    return yield* Effect43.fail(new Error("Missing handler patterns"));
   }
   const files = findHandlerFiles(patterns, projectDir);
   const handlers = discoverHandlers(files);
@@ -7285,7 +6917,7 @@ var loadRequiredParams = (projectOpt, stage, region) => Effect44.gen(function* (
 var listCommand = Command6.make(
   "list",
   { project: projectOption, stage: stageOption, region: regionOption, verbose: verboseOption },
-  ({ project: projectOpt, stage, region, verbose }) => Effect44.gen(function* () {
+  ({ project: projectOpt, stage, region, verbose }) => Effect43.gen(function* () {
     const ctx = yield* loadRequiredParams(projectOpt, stage, region);
     const { params } = ctx;
     if (params.length === 0) {
@@ -7293,7 +6925,7 @@ var listCommand = Command6.make(
       return;
     }
     const { existing, missing } = yield* checkMissingParams(params).pipe(
-      Effect44.provide(clients_exports.makeClients({ ssm: { region: ctx.region } }))
+      Effect43.provide(clients_exports.makeClients({ ssm: { region: ctx.region } }))
     );
     yield* Console8.log(`
 ${c.bold("Config parameters")} ${c.dim(`(${ctx.project} / ${ctx.stage})`)}
@@ -7317,7 +6949,7 @@ ${c.bold("Config parameters")} ${c.dim(`(${ctx.project} / ${ctx.stage})`)}
     }
     yield* Console8.log("");
   }).pipe(
-    Effect44.provide(ProjectConfig.Live),
+    Effect43.provide(ProjectConfig.Live),
     Logger5.withMinimumLogLevel(LogLevel5.Warning)
   )
 ).pipe(Command6.withDescription("List all declared config parameters and show which are set vs missing"));
@@ -7327,7 +6959,7 @@ var setKeyArg = Args3.text({ name: "key" }).pipe(
 var setCommand = Command6.make(
   "set",
   { key: setKeyArg, project: projectOption, stage: stageOption, region: regionOption, verbose: verboseOption },
-  ({ key, project: projectOpt, stage, region, verbose }) => Effect44.gen(function* () {
+  ({ key, project: projectOpt, stage, region, verbose }) => Effect43.gen(function* () {
     const { config } = yield* ProjectConfig;
     const project = Option5.getOrElse(projectOpt, () => config?.name ?? "");
     if (!project) {
@@ -7345,18 +6977,18 @@ var setCommand = Command6.make(
       Value: value,
       Type: "SecureString",
       Overwrite: true
-    }).pipe(Effect44.provide(clients_exports.makeClients({ ssm: { region: finalRegion } })));
+    }).pipe(Effect43.provide(clients_exports.makeClients({ ssm: { region: finalRegion } })));
     yield* Console8.log(`
   ${c.green("\u2713")} ${c.cyan(ssmPath)} ${c.dim("(SecureString)")}`);
   }).pipe(
-    Effect44.provide(ProjectConfig.Live),
+    Effect43.provide(ProjectConfig.Live),
     Logger5.withMinimumLogLevel(LogLevel5.Warning)
   )
 ).pipe(Command6.withDescription("Set a config parameter value (stored encrypted in AWS)"));
 var configRootCommand = Command6.make(
   "config",
   { project: projectOption, stage: stageOption, region: regionOption, verbose: verboseOption },
-  ({ project: projectOpt, stage, region, verbose }) => Effect44.gen(function* () {
+  ({ project: projectOpt, stage, region, verbose }) => Effect43.gen(function* () {
     const ctx = yield* loadRequiredParams(projectOpt, stage, region);
     const { params } = ctx;
     if (params.length === 0) {
@@ -7364,7 +6996,7 @@ var configRootCommand = Command6.make(
       return;
     }
     const { missing } = yield* checkMissingParams(params).pipe(
-      Effect44.provide(clients_exports.makeClients({ ssm: { region: ctx.region } }))
+      Effect43.provide(clients_exports.makeClients({ ssm: { region: ctx.region } }))
     );
     if (missing.length === 0) {
       yield* Console8.log(`
@@ -7389,7 +7021,7 @@ ${c.bold("Missing parameters")} ${c.dim(`(${ctx.project} / ${ctx.stage})`)}
         Value: value,
         Type: "SecureString",
         Overwrite: false
-      }).pipe(Effect44.provide(clients_exports.makeClients({ ssm: { region: ctx.region } })));
+      }).pipe(Effect43.provide(clients_exports.makeClients({ ssm: { region: ctx.region } })));
       yield* Console8.log(`  ${c.green("\u2713")} created`);
       created++;
     }
@@ -7403,7 +7035,7 @@ ${c.bold("Missing parameters")} ${c.dim(`(${ctx.project} / ${ctx.stage})`)}
 `);
     }
   }).pipe(
-    Effect44.provide(ProjectConfig.Live),
+    Effect43.provide(ProjectConfig.Live),
     Logger5.withMinimumLogLevel(LogLevel5.Warning)
   )
 ).pipe(
@@ -7424,7 +7056,7 @@ var cli = Command7.run(mainCommand, {
   version
 });
 cli(process.argv).pipe(
-  Effect45.provide(NodeContext.layer),
-  Effect45.provide(CliConfig.layer({ showBuiltIns: false, showTypes: false })),
+  Effect44.provide(NodeContext.layer),
+  Effect44.provide(CliConfig.layer({ showBuiltIns: false, showTypes: false })),
   NodeRuntime.runMain
 );