@effortless-aws/cli 0.1.1 → 0.2.0

package/dist/cli/index.js

@@ -6,15 +6,15 @@ var __export = (target, all) => {
 };
 
 // src/cli/index.ts
-import { Command as Command7 } from "@effect/cli";
+import { CliConfig, Command as Command7 } from "@effect/cli";
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
-import { Effect as Effect43 } from "effect";
+import { Effect as Effect45 } from "effect";
 import { createRequire as createRequire2 } from "module";
 
 // src/cli/commands/deploy.ts
 import { Args, Command } from "@effect/cli";
-import { Effect as Effect36, Console as Console3, Logger, LogLevel, Option } from "effect";
-import * as path8 from "path";
+import { Effect as Effect38, 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";
@@ -2628,6 +2628,64 @@ var readProductionDependencies = (projectDir) => Effect18.gen(function* () {
   const pkg = JSON.parse(content);
   return Object.keys(pkg.dependencies ?? {});
 });
+var DEV_ONLY_PACKAGES = /* @__PURE__ */ new Set([
+  "typescript",
+  "ts-node",
+  "tsx",
+  "vitest",
+  "jest",
+  "mocha",
+  "eslint",
+  "prettier",
+  "tsup",
+  "esbuild",
+  "webpack",
+  "rollup",
+  "vite",
+  "turbo",
+  "husky",
+  "lint-staged",
+  "commitlint",
+  "nodemon",
+  "ts-jest",
+  "concurrently",
+  "rimraf"
+]);
+var DEV_ONLY_PREFIXES = [
+  "@types/",
+  "@typescript-eslint/",
+  "@eslint/",
+  "eslint-plugin-",
+  "eslint-config-",
+  "@vitest/",
+  "@jest/"
+];
+var checkDependencyWarnings = (projectDir) => Effect18.gen(function* () {
+  const pkgPath = path.join(projectDir, "package.json");
+  const content = yield* Effect18.tryPromise({
+    try: () => fs.readFile(pkgPath, "utf-8"),
+    catch: () => Effect18.succeed(null)
+  });
+  if (!content) return [];
+  const pkg = JSON.parse(content);
+  const deps = Object.keys(pkg.dependencies ?? {});
+  const devDeps = Object.keys(pkg.devDependencies ?? {});
+  const warnings = [];
+  const devInProd = deps.filter(
+    (d) => DEV_ONLY_PACKAGES.has(d) || DEV_ONLY_PREFIXES.some((p) => d.startsWith(p))
+  );
+  if (devInProd.length > 0) {
+    warnings.push(
+      `These packages are in "dependencies" but look like dev tools (they will bloat the Lambda layer): ${devInProd.join(", ")}. Consider moving them to "devDependencies".`
+    );
+  }
+  if (deps.length === 0 && devDeps.length > 0) {
+    warnings.push(
+      `"dependencies" is empty but "devDependencies" has ${devDeps.length} package(s). Runtime packages must be in "dependencies" to be included in the Lambda layer.`
+    );
+  }
+  return warnings;
+});
 var getPackageRealPath = (projectDir, pkgName) => {
   const pkgPath = path.join(projectDir, "node_modules", pkgName);
   if (!fsSync.existsSync(pkgPath)) return null;
@@ -2816,6 +2874,12 @@ var getExistingLayerByHash = (layerName, expectedHash) => Effect18.gen(function*
   };
 });
 var ensureLayer = (config) => Effect18.gen(function* () {
+  const depWarnings = yield* checkDependencyWarnings(config.projectDir).pipe(
+    Effect18.catchAll(() => Effect18.succeed([]))
+  );
+  for (const w of depWarnings) {
+    yield* Effect18.logWarning(`[layer] ${w}`);
+  }
   const dependencies = yield* readProductionDependencies(config.projectDir).pipe(
     Effect18.catchAll(() => Effect18.succeed([]))
   );
@@ -3524,7 +3588,7 @@ var ensureDistribution = (input) => Effect21.gen(function* () {
   };
 });
 var ensureSsrDistribution = (input) => Effect21.gen(function* () {
-  const { project, stage, handlerName, bucketName, bucketRegion, s3OacId, lambdaOriginDomain, lambdaOacId, assetPatterns, tags, aliases, acmCertificateArn } = input;
+  const { project, stage, handlerName, bucketName, bucketRegion, s3OacId, lambdaOriginDomain, lambdaOacId, assetPatterns, tags, aliases, acmCertificateArn, apiOriginDomain, routePatterns } = input;
   const comment = makeDistComment(project, stage, handlerName);
   const lambdaOriginId = `Lambda-${project}-${stage}-${handlerName}`;
   const s3OriginId = `S3-${bucketName}`;
@@ -3537,6 +3601,8 @@ var ensureSsrDistribution = (input) => Effect21.gen(function* () {
   } : void 0;
   const ALL_METHODS = ["GET", "HEAD", "OPTIONS", "PUT", "POST", "PATCH", "DELETE"];
   const CACHED_METHODS = ["GET", "HEAD"];
+  const hasApiRoutes = apiOriginDomain && routePatterns && routePatterns.length > 0;
+  const apiOriginId = hasApiRoutes ? `API-${project}-${stage}` : void 0;
   const originsItems = [
     {
       Id: lambdaOriginId,
@@ -3560,7 +3626,23 @@ var ensureSsrDistribution = (input) => Effect21.gen(function* () {
       OriginAccessControlId: s3OacId,
       S3OriginConfig: { OriginAccessIdentity: "" },
       CustomHeaders: { Quantity: 0, Items: [] }
-    }
+    },
+    ...hasApiRoutes ? [{
+      Id: apiOriginId,
+      DomainName: apiOriginDomain,
+      OriginPath: "",
+      ConnectionAttempts: 3,
+      ConnectionTimeout: 10,
+      CustomOriginConfig: {
+        HTTPPort: 80,
+        HTTPSPort: 443,
+        OriginProtocolPolicy: "https-only",
+        OriginSslProtocols: { Quantity: 1, Items: ["TLSv1.2"] },
+        OriginReadTimeout: 30,
+        OriginKeepaliveTimeout: 5
+      },
+      CustomHeaders: { Quantity: 0, Items: [] }
+    }] : []
   ];
   const defaultCacheBehavior = {
     TargetOriginId: lambdaOriginId,
@@ -3579,26 +3661,42 @@ var ensureSsrDistribution = (input) => Effect21.gen(function* () {
     LambdaFunctionAssociations: { Quantity: 0, Items: [] },
     FieldLevelEncryptionId: ""
   };
-  const cacheBehaviors = assetPatterns.length > 0 ? {
-    Quantity: assetPatterns.length,
-    Items: assetPatterns.map((pattern) => ({
-      PathPattern: pattern,
-      TargetOriginId: s3OriginId,
-      ViewerProtocolPolicy: "redirect-to-https",
-      AllowedMethods: {
-        Quantity: 2,
-        Items: [...CACHED_METHODS],
-        CachedMethods: { Quantity: 2, Items: [...CACHED_METHODS] }
-      },
-      Compress: true,
-      SmoothStreaming: false,
-      CachePolicyId: CACHING_OPTIMIZED_POLICY_ID,
-      ResponseHeadersPolicyId: SECURITY_HEADERS_POLICY_ID,
-      FunctionAssociations: { Quantity: 0, Items: [] },
-      LambdaFunctionAssociations: { Quantity: 0, Items: [] },
-      FieldLevelEncryptionId: ""
-    }))
-  } : { Quantity: 0, Items: [] };
+  const apiRouteBehaviors = hasApiRoutes ? routePatterns.map((pattern) => ({
+    PathPattern: pattern,
+    TargetOriginId: apiOriginId,
+    ViewerProtocolPolicy: "redirect-to-https",
+    AllowedMethods: {
+      Quantity: 7,
+      Items: [...ALL_METHODS],
+      CachedMethods: { Quantity: 2, Items: [...CACHED_METHODS] }
+    },
+    Compress: true,
+    SmoothStreaming: false,
+    CachePolicyId: CACHING_DISABLED_POLICY_ID,
+    OriginRequestPolicyId: ALL_VIEWER_EXCEPT_HOST_HEADER_POLICY_ID,
+    FunctionAssociations: { Quantity: 0, Items: [] },
+    LambdaFunctionAssociations: { Quantity: 0, Items: [] },
+    FieldLevelEncryptionId: ""
+  })) : [];
+  const assetBehaviors = assetPatterns.map((pattern) => ({
+    PathPattern: pattern,
+    TargetOriginId: s3OriginId,
+    ViewerProtocolPolicy: "redirect-to-https",
+    AllowedMethods: {
+      Quantity: 2,
+      Items: [...CACHED_METHODS],
+      CachedMethods: { Quantity: 2, Items: [...CACHED_METHODS] }
+    },
+    Compress: true,
+    SmoothStreaming: false,
+    CachePolicyId: CACHING_OPTIMIZED_POLICY_ID,
+    ResponseHeadersPolicyId: SECURITY_HEADERS_POLICY_ID,
+    FunctionAssociations: { Quantity: 0, Items: [] },
+    LambdaFunctionAssociations: { Quantity: 0, Items: [] },
+    FieldLevelEncryptionId: ""
+  }));
+  const allBehaviors = [...apiRouteBehaviors, ...assetBehaviors];
+  const cacheBehaviors = allBehaviors.length > 0 ? { Quantity: allBehaviors.length, Items: allBehaviors } : { Quantity: 0, Items: [] };
   const existing = yield* findDistributionByTags(project, stage, handlerName);
   if (existing) {
     const configResult = yield* cloudfront_exports.make("get_distribution_config", {
@@ -4375,6 +4473,19 @@ var discoverHandlers = (files) => {
   }
   return { httpHandlers, 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),
+    ...entries("queue", discovered.fifoQueueHandlers),
+    ...entries("bucket", discovered.bucketHandlers),
+    ...entries("mailer", discovered.mailerHandlers),
+    ...entries("api", discovered.apiHandlers)
+  ];
+};
 
 // src/deploy/resolve-config.ts
 import { Effect as Effect25 } from "effect";
@@ -4448,10 +4559,10 @@ var ensureLayerAndExternal = (input) => Effect26.gen(function* () {
     project: input.project,
     stage: input.stage,
     region: input.region,
-    projectDir: input.projectDir
+    projectDir: input.packageDir
   });
-  const prodDeps = layerResult ? yield* readProductionDependencies(input.projectDir) : [];
-  const { packages: external, warnings: layerWarnings } = prodDeps.length > 0 ? yield* Effect26.sync(() => collectLayerPackages(input.projectDir, prodDeps)) : { packages: [], warnings: [] };
+  const prodDeps = layerResult ? yield* readProductionDependencies(input.packageDir) : [];
+  const { packages: external, warnings: layerWarnings } = prodDeps.length > 0 ? yield* Effect26.sync(() => collectLayerPackages(input.packageDir, prodDeps)) : { packages: [], warnings: [] };
   for (const warning of layerWarnings) {
     yield* Effect26.logWarning(`[layer] ${warning}`);
   }
@@ -4566,7 +4677,7 @@ var deploy = (input) => Effect27.gen(function* () {
     project: input.project,
     stage: tagCtx.stage,
     region: input.region,
-    projectDir: input.projectDir
+    packageDir: input.packageDir ?? input.projectDir
   });
   const { functionArn } = yield* deployLambda({
     input,
@@ -4619,7 +4730,7 @@ var deployAll = (input) => Effect27.gen(function* () {
     project: input.project,
     stage: tagCtx.stage,
     region: input.region,
-    projectDir: input.projectDir
+    packageDir: input.packageDir ?? input.projectDir
   });
   yield* Effect27.logDebug("Setting up API Gateway...");
   const { apiId } = yield* ensureProjectApi({
@@ -4731,7 +4842,7 @@ var deployTable = (input) => Effect28.gen(function* () {
     project: input.project,
     stage: resolveStage(input.stage),
     region: input.region,
-    projectDir: input.projectDir
+    packageDir: input.packageDir ?? input.projectDir
   });
   const result = yield* deployTableFunction({
     input,
@@ -4760,7 +4871,7 @@ var deployAllTables = (input) => Effect28.gen(function* () {
     project: input.project,
     stage: resolveStage(input.stage),
     region: input.region,
-    projectDir: input.projectDir
+    packageDir: input.packageDir ?? input.projectDir
   });
   const results = yield* Effect28.forEach(
     functions,
@@ -4793,12 +4904,31 @@ var deployApp = (input) => Effect29.gen(function* () {
   const stage = resolveStage(input.stage);
   const handlerName = exportName;
   const tagCtx = { project, stage, handler: handlerName };
+  const routePatterns = fn13.routePatterns;
+  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.`
+      )
+    );
+  }
   if (config.build) {
     yield* Effect29.logDebug(`Building app: ${config.build}`);
+    const buildStart = Date.now();
     yield* Effect29.try({
-      try: () => execSync(config.build, { cwd: projectDir, stdio: "inherit" }),
-      catch: (error) => new Error(`App build failed: ${error}`)
+      try: () => execSync(config.build, {
+        cwd: projectDir,
+        stdio: input.verbose ? "inherit" : "pipe"
+      }),
+      catch: (error) => {
+        if (!input.verbose && error && typeof error === "object" && "stderr" in error) {
+          const stderr = String(error.stderr);
+          if (stderr) process.stderr.write(stderr);
+        }
+        return new Error(`App build failed: ${config.build}`);
+      }
     });
+    yield* Effect29.logDebug(`App built in ${((Date.now() - buildStart) / 1e3).toFixed(1)}s`);
   }
   const serverDir = path5.resolve(projectDir, config.server);
   yield* Effect29.logDebug(`Zipping server directory: ${serverDir}`);
@@ -4864,7 +4994,8 @@ var deployApp = (input) => Effect29.gen(function* () {
     assetPatterns,
     tags: makeTags(tagCtx, "cloudfront-distribution"),
     aliases,
-    acmCertificateArn
+    acmCertificateArn,
+    ...input.apiOriginDomain && routePatterns.length > 0 ? { apiOriginDomain: input.apiOriginDomain, routePatterns } : {}
   });
   yield* addCloudFrontPermission(lambdaName, distributionArn);
   yield* putBucketPolicyForOAC(bucketName, distributionArn);
@@ -4978,10 +5109,21 @@ var deployStaticSite = (input) => Effect30.gen(function* () {
   }
   if (config.build) {
     yield* Effect30.logDebug(`Building site: ${config.build}`);
+    const buildStart = Date.now();
     yield* Effect30.try({
-      try: () => execSync2(config.build, { cwd: projectDir, stdio: "inherit" }),
-      catch: (error) => new Error(`Site build failed: ${error}`)
+      try: () => execSync2(config.build, {
+        cwd: projectDir,
+        stdio: input.verbose ? "inherit" : "pipe"
+      }),
+      catch: (error) => {
+        if (!input.verbose && error && typeof error === "object" && "stderr" in error) {
+          const stderr = String(error.stderr);
+          if (stderr) process.stderr.write(stderr);
+        }
+        return new Error(`Site build failed: ${config.build}`);
+      }
     });
+    yield* Effect30.logDebug(`Site built in ${((Date.now() - buildStart) / 1e3).toFixed(1)}s`);
   }
   const bucketName = `${project}-${stage}-${handlerName}-site`.toLowerCase();
   yield* ensureBucket({
@@ -5325,7 +5467,7 @@ var prepareLayer = (input) => Effect35.gen(function* () {
     project: input.project,
     stage: input.stage,
     region: input.region,
-    projectDir: input.projectDir
+    projectDir: input.packageDir
   }).pipe(
     Effect35.provide(
       clients_exports.makeClients({
@@ -5333,8 +5475,8 @@ var prepareLayer = (input) => Effect35.gen(function* () {
       })
     )
   );
-  const prodDeps = layerResult ? yield* readProductionDependencies(input.projectDir) : [];
-  const { packages: external, warnings: layerWarnings } = prodDeps.length > 0 ? yield* Effect35.sync(() => collectLayerPackages(input.projectDir, prodDeps)) : { packages: [], warnings: [] };
+  const prodDeps = layerResult ? yield* readProductionDependencies(input.packageDir) : [];
+  const { packages: external, warnings: layerWarnings } = prodDeps.length > 0 ? yield* Effect35.sync(() => collectLayerPackages(input.packageDir, prodDeps)) : { packages: [], warnings: [] };
   for (const warning of layerWarnings) {
     yield* Effect35.logWarning(`[layer] ${warning}`);
   }
@@ -5523,9 +5665,10 @@ var buildTableTasks = (ctx, handlers, results) => {
   }
   return tasks;
 };
-var buildAppTasks = (ctx, handlers, results) => {
+var buildAppTasks = (ctx, handlers, results, apiId) => {
   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(
@@ -5535,7 +5678,9 @@ var buildAppTasks = (ctx, handlers, results) => {
             project: ctx.input.project,
             stage: ctx.input.stage,
             region,
-            fn: fn13
+            fn: fn13,
+            verbose: ctx.input.verbose,
+            ...apiOriginDomain ? { apiOriginDomain } : {}
           }).pipe(Effect35.provide(clients_exports.makeClients({
             lambda: { region },
             iam: { region },
@@ -5566,6 +5711,7 @@ var buildStaticSiteTasks = (ctx, handlers, results, apiId) => {
             stage: ctx.input.stage,
             region,
             fn: fn13,
+            verbose: ctx.input.verbose,
             ...fn13.hasHandler ? { file } : {},
             ...apiOriginDomain ? { apiOriginDomain } : {}
           }).pipe(Effect35.provide(clients_exports.makeClients({
@@ -5748,7 +5894,7 @@ var deployProject = (input) => Effect35.gen(function* () {
     project: input.project,
     stage,
     region: input.region,
-    projectDir: input.projectDir
+    packageDir: input.packageDir ?? input.projectDir
   });
   if (layerArn && layerStatus) {
     const status = layerStatus === "cached" ? c.dim("cached") : c.green("created");
@@ -5759,7 +5905,10 @@ var deployProject = (input) => Effect35.gen(function* () {
   const staticSitesNeedApi = !input.noSites && staticSiteHandlers.some(
     ({ exports }) => exports.some((fn13) => fn13.routePatterns.length > 0)
   );
-  if (totalHttpHandlers > 0 || totalApiHandlers > 0 || staticSitesNeedApi) {
+  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,
@@ -5824,7 +5973,7 @@ var deployProject = (input) => Effect35.gen(function* () {
   const tasks = [
     ...apiId ? buildHttpTasks(ctx, httpHandlers, apiId, httpResults) : [],
     ...buildTableTasks(ctx, tableHandlers, tableResults),
-    ...buildAppTasks(ctx, appHandlers, appResults),
+    ...buildAppTasks(ctx, appHandlers, appResults, apiId),
     ...input.noSites ? [] : buildStaticSiteTasks(ctx, staticSiteHandlers, staticSiteResults, apiId),
     ...buildFifoQueueTasks(ctx, fifoQueueHandlers, fifoQueueResults),
     ...buildBucketTasks(ctx, bucketHandlers, bucketResults),
@@ -5876,18 +6025,22 @@ import * as path7 from "path";
 import * as fs4 from "fs";
 import { pathToFileURL } from "url";
 import * as esbuild2 from "esbuild";
-var loadConfig = async () => {
+import { Effect as Effect36 } from "effect";
+var loadConfig = Effect36.fn("loadConfig")(function* () {
   const configPath = path7.resolve(process.cwd(), "effortless.config.ts");
   if (!fs4.existsSync(configPath)) {
     return null;
   }
-  const result = await esbuild2.build({
-    entryPoints: [configPath],
-    bundle: true,
-    write: false,
-    format: "esm",
-    platform: "node",
-    external: ["effortless-aws"]
+  const result = yield* Effect36.tryPromise({
+    try: () => esbuild2.build({
+      entryPoints: [configPath],
+      bundle: true,
+      write: false,
+      format: "esm",
+      platform: "node",
+      external: ["effortless-aws"]
+    }),
+    catch: (error) => new Error(`Failed to compile config: ${error}`)
   });
   const output = result.outputFiles?.[0];
   if (!output) {
@@ -5896,13 +6049,12 @@ var loadConfig = async () => {
   const code = output.text;
   const tempFile = path7.join(process.cwd(), ".effortless-config.mjs");
   fs4.writeFileSync(tempFile, code);
-  try {
-    const mod = await import(pathToFileURL(tempFile).href);
-    return mod.default;
-  } finally {
-    fs4.unlinkSync(tempFile);
-  }
-};
+  const mod = yield* Effect36.tryPromise({
+    try: () => import(pathToFileURL(tempFile).href),
+    catch: (error) => new Error(`Failed to load config: ${error}`)
+  }).pipe(Effect36.ensuring(Effect36.sync(() => fs4.unlinkSync(tempFile))));
+  return mod.default;
+});
 var projectOption = Options.text("project").pipe(
   Options.withAlias("p"),
   Options.withDescription("Project name (or 'name' in effortless.config.ts)"),
@@ -5910,12 +6062,12 @@ var projectOption = Options.text("project").pipe(
 );
 var stageOption = Options.text("stage").pipe(
   Options.withAlias("s"),
-  Options.withDescription("Stage name"),
+  Options.withDescription("Deployment stage (default: dev)"),
   Options.withDefault("dev")
 );
 var regionOption = Options.text("region").pipe(
   Options.withAlias("r"),
-  Options.withDescription("AWS region"),
+  Options.withDescription("AWS region (default: eu-central-1)"),
   Options.withDefault("eu-central-1")
 );
 var verboseOption = Options.boolean("verbose").pipe(
@@ -5948,6 +6100,23 @@ 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 path8 from "path";
+var ProjectConfig = class _ProjectConfig extends Context13.Tag("ProjectConfig")() {
+  static Live = Layer14.effect(
+    _ProjectConfig,
+    Effect37.gen(function* () {
+      const config = yield* loadConfig();
+      const cwd = process.cwd();
+      const projectDir = config?.root ? path8.resolve(cwd, config.root) : cwd;
+      return { config, cwd, projectDir };
+    })
+  );
+};
+
 // src/cli/commands/deploy.ts
 var deployTargetArg = Args.text({ name: "target" }).pipe(
   Args.withDescription("Handler name or file path to deploy (optional - uses config patterns if not specified)"),
@@ -5959,8 +6128,8 @@ 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 }) => Effect36.gen(function* () {
-    const config = yield* Effect36.promise(loadConfig);
+  ({ target, project: projectOpt, stage, region, verbose, noSites }) => Effect38.gen(function* () {
+    const { config, cwd, projectDir } = yield* ProjectConfig;
     const project = Option.getOrElse(projectOpt, () => config?.name ?? "");
     const finalStage = config?.stage ?? stage;
     const finalRegion = config?.region ?? region;
@@ -5979,9 +6148,8 @@ var deployCommand = Command.make(
       acm: { region: "us-east-1" }
     });
     const logLevel = verbose ? LogLevel.Debug : LogLevel.Warning;
-    const projectDir = process.cwd();
     yield* Option.match(target, {
-      onNone: () => Effect36.gen(function* () {
+      onNone: () => Effect38.gen(function* () {
         const patterns = getPatternsFromConfig(config);
         if (!patterns) {
           yield* Console3.error("Error: No target specified and no 'handlers' patterns in config");
@@ -5989,13 +6157,15 @@ var deployCommand = Command.make(
         }
         const results = yield* deployProject({
           projectDir,
+          packageDir: cwd,
           patterns,
           project,
           stage: finalStage,
           region: finalRegion,
-          noSites
+          noSites,
+          verbose
         });
-        const total = results.httpResults.length + results.tableResults.length + results.appResults.length + results.staticSiteResults.length;
+        const total = results.httpResults.length + results.tableResults.length + results.appResults.length + results.staticSiteResults.length + results.apiResults.length;
         yield* Console3.log(`
 ${c.green(`Deployed ${total} handler(s):`)}`);
         if (results.apiUrl) {
@@ -6014,6 +6184,10 @@ ${c.green(`Deployed ${total} handler(s):`)}`);
         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)}` });
+        }
         for (const r of results.staticSiteResults) {
           summaryLines.push({ name: r.exportName, line: `  ${c.cyan("[site]")}  ${c.bold(r.exportName)}: ${c.cyan(r.url)}` });
         }
@@ -6022,26 +6196,27 @@ ${c.green(`Deployed ${total} handler(s):`)}`);
           yield* Console3.log(line);
         }
       }),
-      onSome: (targetValue) => Effect36.gen(function* () {
+      onSome: (targetValue) => Effect38.gen(function* () {
         if (isFilePath(targetValue)) {
-          const fullPath = path8.isAbsolute(targetValue) ? targetValue : path8.resolve(projectDir, targetValue);
+          const fullPath = path9.isAbsolute(targetValue) ? targetValue : path9.resolve(projectDir, targetValue);
           const input = {
             projectDir,
+            packageDir: cwd,
             file: fullPath,
             project,
             stage: finalStage,
             region: finalRegion
           };
           const httpResult = yield* deployAll(input).pipe(
-            Effect36.catchIf(
+            Effect38.catchIf(
               (e) => e instanceof Error && e.message.includes("No defineHttp"),
-              () => Effect36.succeed(null)
+              () => Effect38.succeed(null)
             )
           );
           const tableResults = yield* deployAllTables(input).pipe(
-            Effect36.catchIf(
+            Effect38.catchIf(
               (e) => e instanceof Error && e.message.includes("No defineTable"),
-              () => Effect36.succeed([])
+              () => Effect38.succeed([])
             )
           );
           if (!httpResult && tableResults.length === 0) {
@@ -6071,68 +6246,23 @@ Deployed ${tableResults.length} table handler(s):`));
           }
           const files = findHandlerFiles(patterns, projectDir);
           const discovered = discoverHandlers(files);
-          let foundFile = null;
-          let foundExport = null;
-          let handlerType = "http";
-          for (const { file, exports } of discovered.httpHandlers) {
-            for (const { exportName } of exports) {
-              if (exportName === targetValue) {
-                foundFile = file;
-                foundExport = exportName;
-                break;
-              }
-            }
-            if (foundFile) break;
-          }
-          if (!foundFile) {
-            for (const { file, exports } of discovered.tableHandlers) {
-              for (const { exportName } of exports) {
-                if (exportName === targetValue) {
-                  foundFile = file;
-                  foundExport = exportName;
-                  handlerType = "table";
-                  break;
-                }
-              }
-              if (foundFile) break;
-            }
-          }
-          if (!foundFile) {
-            for (const { file, exports } of discovered.appHandlers) {
-              for (const { exportName } of exports) {
-                if (exportName === targetValue) {
-                  foundFile = file;
-                  foundExport = exportName;
-                  handlerType = "app";
-                  break;
-                }
-              }
-              if (foundFile) break;
-            }
-          }
-          if (!foundFile || !foundExport) {
+          const allHandlers = flattenHandlers(discovered);
+          const found = allHandlers.find((h) => h.exportName === targetValue);
+          if (!found) {
             yield* Console3.error(`Error: Handler "${targetValue}" not found`);
             yield* Console3.log("\nAvailable handlers:");
-            for (const { exports } of discovered.httpHandlers) {
-              for (const { exportName } of exports) {
-                yield* Console3.log(`  ${c.cyan("[http]")}  ${exportName}`);
-              }
-            }
-            for (const { exports } of discovered.tableHandlers) {
-              for (const { exportName } of exports) {
-                yield* Console3.log(`  ${c.cyan("[table]")} ${exportName}`);
-              }
-            }
-            for (const { exports } of discovered.appHandlers) {
-              for (const { exportName } of exports) {
-                yield* Console3.log(`  ${c.cyan("[app]")}   ${exportName}`);
-              }
+            for (const h of allHandlers) {
+              yield* Console3.log(`  ${c.cyan(`[${h.type}]`.padEnd(9))} ${h.exportName}`);
             }
             return;
           }
-          yield* Console3.log(`Found handler ${c.bold(targetValue)} in ${c.dim(path8.relative(projectDir, foundFile))}`);
+          const foundFile = found.file;
+          const foundExport = found.exportName;
+          const handlerType = found.type;
+          yield* Console3.log(`Found handler ${c.bold(targetValue)} in ${c.dim(path9.relative(projectDir, foundFile))}`);
           const input = {
             projectDir,
+            packageDir: cwd,
             file: foundFile,
             project,
             stage: finalStage,
@@ -6151,15 +6281,15 @@ ${c.green("Deployed:")} ${c.cyan(result.url)}`);
         }
       })
     }).pipe(
-      Effect36.provide(clientsLayer),
+      Effect38.provide(clientsLayer),
       Logger.withMinimumLogLevel(logLevel)
     );
-  })
-).pipe(Command.withDescription("Deploy handlers (all from config, by file path, or by handler name)"));
+  }).pipe(Effect38.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 Effect37, Console as Console4, Logger as Logger2, LogLevel as LogLevel2, Option as Option2 } from "effect";
+import { Effect as Effect39, Console as Console4, Logger as Logger2, LogLevel as LogLevel2, Option as Option2 } from "effect";
 var { lambda, apigatewayv2: apigateway } = clients_exports;
 var INTERNAL_HANDLERS = /* @__PURE__ */ new Set(["api", "platform"]);
 var extractFunctionName = (arn) => {
@@ -6184,7 +6314,7 @@ var formatDate = (date) => {
   if (days < 7) return `${days}d ago`;
   return d.toLocaleDateString("en-US", { month: "short", day: "numeric" });
 };
-var getLambdaDetails = (functionName) => Effect37.gen(function* () {
+var getLambdaDetails = (functionName) => Effect39.gen(function* () {
   const config = yield* lambda.make("get_function_configuration", {
     FunctionName: functionName
   });
@@ -6194,62 +6324,21 @@ var getLambdaDetails = (functionName) => Effect37.gen(function* () {
     timeout: config.Timeout
   };
 }).pipe(
-  Effect37.catchAll(() => Effect37.succeed({}))
+  Effect39.catchAll(() => Effect39.succeed({}))
 );
-var getApiUrl = (apiId) => Effect37.gen(function* () {
+var getApiUrl = (apiId) => Effect39.gen(function* () {
   const api = yield* apigateway.make("get_api", { ApiId: apiId });
   return api.ApiEndpoint;
 }).pipe(
-  Effect37.catchAll(() => Effect37.succeed(void 0))
+  Effect39.catchAll(() => Effect39.succeed(void 0))
 );
 var discoverCodeHandlers = (projectDir, patterns) => {
   const files = findHandlerFiles(patterns, projectDir);
   const discovered = discoverHandlers(files);
-  const handlers = [];
-  for (const { exports } of discovered.httpHandlers) {
-    for (const fn13 of exports) {
-      handlers.push({
-        name: fn13.exportName,
-        type: "http",
-        method: fn13.config.method,
-        path: fn13.config.path
-      });
-    }
-  }
-  for (const { exports } of discovered.tableHandlers) {
-    for (const fn13 of exports) {
-      handlers.push({
-        name: fn13.exportName,
-        type: "table"
-      });
-    }
-  }
-  for (const { exports } of discovered.appHandlers) {
-    for (const fn13 of exports) {
-      handlers.push({
-        name: fn13.exportName,
-        type: "app",
-        path: fn13.config.path
-      });
-    }
-  }
-  for (const { exports } of discovered.staticSiteHandlers) {
-    for (const fn13 of exports) {
-      handlers.push({
-        name: fn13.exportName,
-        type: "site"
-      });
-    }
-  }
-  for (const { exports } of discovered.fifoQueueHandlers) {
-    for (const fn13 of exports) {
-      handlers.push({
-        name: fn13.exportName,
-        type: "queue"
-      });
-    }
-  }
-  return handlers;
+  return flattenHandlers(discovered).map((h) => ({
+    name: h.exportName,
+    type: h.type
+  }));
 };
 var discoverAwsHandlers = (resources) => {
   const byHandler = groupResourcesByHandler(resources);
@@ -6277,6 +6366,7 @@ var TYPE_LABELS = {
   http: "http",
   table: "table",
   app: "app",
+  api: "api",
   site: "site",
   queue: "queue",
   lambda: "lambda",
@@ -6297,9 +6387,9 @@ var STATUS_COLORS = {
 var formatStatus = (status) => {
   return STATUS_COLORS[status](status.padEnd(10));
 };
-var formatRoute = (method, path10) => {
-  if (method && path10) return `${method.padEnd(5)} ${path10}`;
-  if (path10) return path10;
+var formatRoute = (method, path11) => {
+  if (method && path11) return `${method.padEnd(5)} ${path11}`;
+  if (path11) return path11;
   return "";
 };
 var formatEntry = (entry) => {
@@ -6321,8 +6411,8 @@ var formatEntry = (entry) => {
 var statusCommand = Command2.make(
   "status",
   { project: projectOption, stage: stageOption, region: regionOption, verbose: verboseOption },
-  ({ project: projectOpt, stage, region, verbose }) => Effect37.gen(function* () {
-    const config = yield* Effect37.promise(loadConfig);
+  ({ project: projectOpt, stage, region, verbose }) => Effect39.gen(function* () {
+    const { config, projectDir } = yield* ProjectConfig;
     const project = Option2.getOrElse(projectOpt, () => config?.name ?? "");
     const finalStage = config?.stage ?? stage;
     const finalRegion = config?.region ?? region;
@@ -6336,11 +6426,10 @@ var statusCommand = Command2.make(
       resource_groups_tagging_api: { region: finalRegion }
     });
     const logLevel = verbose ? LogLevel2.Debug : LogLevel2.Info;
-    const projectDir = process.cwd();
     const patterns = getPatternsFromConfig(config);
     const codeHandlers = patterns ? discoverCodeHandlers(projectDir, patterns) : [];
     const codeHandlerNames = new Set(codeHandlers.map((h) => h.name));
-    yield* Effect37.gen(function* () {
+    yield* Effect39.gen(function* () {
       yield* Console4.log(`
 Status for ${c.bold(project + "/" + finalStage)}:
 `);
@@ -6437,18 +6526,18 @@ API: ${c.cyan(apiUrl)}`);
       yield* Console4.log(`
 Total: ${parts.join(", ")}`);
     }).pipe(
-      Effect37.provide(clientsLayer),
+      Effect39.provide(clientsLayer),
       Logger2.withMinimumLogLevel(logLevel)
     );
-  })
-).pipe(Command2.withDescription("Show status of handlers (code vs deployed)"));
+  }).pipe(Effect39.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 Effect39, Console as Console5, Logger as Logger3, LogLevel as LogLevel3, Option as Option3 } from "effect";
+import { Effect as Effect41, Console as Console5, Logger as Logger3, LogLevel as LogLevel3, Option as Option3 } from "effect";
 
 // src/deploy/cleanup.ts
-import { Effect as Effect38 } from "effect";
+import { Effect as Effect40 } from "effect";
 var extractResourceName = (arn, type) => {
   switch (type) {
     case "lambda": {
@@ -6491,7 +6580,7 @@ var extractLayerInfo = (arn) => {
     version: parseInt(parts[parts.length - 1] ?? "0", 10)
   };
 };
-var deleteResource = (resource) => Effect38.gen(function* () {
+var deleteResource = (resource) => Effect40.gen(function* () {
   const name = extractResourceName(resource.arn, resource.type);
   switch (resource.type) {
     case "lambda":
@@ -6524,18 +6613,18 @@ var deleteResource = (resource) => Effect38.gen(function* () {
       yield* deleteSesIdentity(name);
       break;
     default:
-      yield* Effect38.logWarning(`Unknown resource type: ${resource.type}, skipping ${resource.arn}`);
+      yield* Effect40.logWarning(`Unknown resource type: ${resource.type}, skipping ${resource.arn}`);
   }
 });
-var deleteResources = (resources) => Effect38.gen(function* () {
+var deleteResources = (resources) => Effect40.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(
-        Effect38.catchAll(
-          (error) => Effect38.logError(`Failed to delete ${resource.type} ${resource.arn}: ${error}`)
+        Effect40.catchAll(
+          (error) => Effect40.logError(`Failed to delete ${resource.type} ${resource.arn}: ${error}`)
         )
       );
       if (resource.type === "lambda") {
@@ -6547,8 +6636,8 @@ var deleteResources = (resources) => Effect38.gen(function* () {
   }
   for (const roleName of iamRolesToDelete) {
     yield* deleteRole(roleName).pipe(
-      Effect38.catchAll(
-        (error) => Effect38.logError(`Failed to delete IAM role ${roleName}: ${error}`)
+      Effect40.catchAll(
+        (error) => Effect40.logError(`Failed to delete IAM role ${roleName}: ${error}`)
       )
     );
   }
@@ -6569,11 +6658,14 @@ var layerOption = Options2.boolean("layer").pipe(
 var rolesOption = Options2.boolean("roles").pipe(
   Options2.withDescription("Clean up orphaned IAM roles instead of handler resources")
 );
+var orphanedOption = Options2.boolean("orphaned").pipe(
+  Options2.withDescription("Delete only handlers that exist in AWS but not in code")
+);
 var cleanupCommand = Command3.make(
   "cleanup",
-  { project: projectOption, stage: stageOption, region: regionOption, handler: handlerOption, layer: layerOption, roles: rolesOption, all: cleanupAllOption, dryRun: dryRunOption, verbose: verboseOption },
-  ({ project: projectOpt, stage, region, handler: handlerOpt, layer: cleanupLayer, roles: cleanupRoles, all: deleteAll, dryRun, verbose }) => Effect39.gen(function* () {
-    const config = yield* Effect39.promise(loadConfig);
+  { 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* () {
+    const { config, projectDir } = yield* ProjectConfig;
     const project = Option3.getOrElse(projectOpt, () => config?.name ?? "");
     const finalStage = config?.stage ?? stage;
     const finalRegion = config?.region ?? region;
@@ -6584,14 +6676,14 @@ var cleanupCommand = Command3.make(
     const logLevel = verbose ? LogLevel3.Debug : LogLevel3.Info;
     if (cleanupLayer) {
       yield* cleanupLayerVersions({ project, region: finalRegion, deleteAll, dryRun }).pipe(
-        Effect39.provide(clients_exports.makeClients({ lambda: { region: finalRegion } })),
+        Effect41.provide(clients_exports.makeClients({ lambda: { region: finalRegion } })),
         Logger3.withMinimumLogLevel(logLevel)
       );
       return;
     }
     if (cleanupRoles) {
       yield* cleanupIamRoles({ project, stage: finalStage, region: finalRegion, deleteAll, dryRun }).pipe(
-        Effect39.provide(clients_exports.makeClients({ iam: { region: finalRegion } })),
+        Effect41.provide(clients_exports.makeClients({ iam: { region: finalRegion } })),
         Logger3.withMinimumLogLevel(logLevel)
       );
       return;
@@ -6606,7 +6698,7 @@ var cleanupCommand = Command3.make(
       s3: { region: finalRegion },
       cloudfront: { region: "us-east-1" }
     });
-    yield* Effect39.gen(function* () {
+    yield* Effect41.gen(function* () {
       yield* Console5.log(`
 Looking for resources in ${c.bold(project + "/" + finalStage)}...
 `);
@@ -6616,14 +6708,34 @@ Looking for resources in ${c.bold(project + "/" + finalStage)}...
         return;
       }
       const byHandler = groupResourcesByHandler(resources);
-      const handlersToDelete = handlerFilter ? [[handlerFilter, byHandler.get(handlerFilter) ?? []]] : Array.from(byHandler.entries());
-      if (handlerFilter && !byHandler.has(handlerFilter)) {
-        yield* Console5.error(`Handler "${handlerFilter}" not found.`);
-        yield* Console5.log("\nAvailable handlers:");
-        for (const [h] of byHandler) {
-          yield* Console5.log(`  - ${h}`);
+      let handlersToDelete;
+      if (cleanupOrphaned) {
+        const patterns = getPatternsFromConfig(config);
+        if (!patterns) {
+          yield* Console5.error("Error: No 'handlers' patterns in config \u2014 cannot determine orphaned handlers");
+          return;
         }
-        return;
+        const files = findHandlerFiles(patterns, projectDir);
+        const discovered = discoverHandlers(files);
+        const codeNames = new Set(flattenHandlers(discovered).map((h) => h.exportName));
+        const INTERNAL_HANDLERS2 = /* @__PURE__ */ new Set(["api", "platform"]);
+        handlersToDelete = Array.from(byHandler.entries()).filter(([name]) => !codeNames.has(name) && !INTERNAL_HANDLERS2.has(name));
+        if (handlersToDelete.length === 0) {
+          yield* Console5.log("No orphaned handlers found.");
+          return;
+        }
+      } else if (handlerFilter) {
+        if (!byHandler.has(handlerFilter)) {
+          yield* Console5.error(`Handler "${handlerFilter}" not found.`);
+          yield* Console5.log("\nAvailable handlers:");
+          for (const [h] of byHandler) {
+            yield* Console5.log(`  - ${h}`);
+          }
+          return;
+        }
+        handlersToDelete = [[handlerFilter, byHandler.get(handlerFilter) ?? []]];
+      } else {
+        handlersToDelete = Array.from(byHandler.entries());
       }
       const resourcesToDelete = [];
       const derivedRoles = [];
@@ -6654,9 +6766,10 @@ Total: ${totalResources} resource(s) (${derivedRoles.length} derived)`);
 ${c.yellow("[DRY RUN]")} No resources were deleted.`);
         return;
       }
-      if (!handlerFilter && !deleteAll) {
+      if (!handlerFilter && !cleanupOrphaned && !deleteAll) {
         yield* Console5.log("\nTo delete these resources, use one of:");
         yield* Console5.log(`  ${c.dim("eff cleanup --all")}                    # Delete all resources`);
+        yield* Console5.log(`  ${c.dim("eff cleanup --orphaned")}               # Delete orphaned handlers only`);
         yield* Console5.log(`  ${c.dim("eff cleanup --handler <name>")}         # Delete specific handler`);
         yield* Console5.log(`  ${c.dim("eff cleanup --dry-run")}                # Preview without deleting`);
         return;
@@ -6665,12 +6778,12 @@ ${c.yellow("[DRY RUN]")} No resources were deleted.`);
       yield* deleteResources(resourcesToDelete);
       yield* Console5.log(c.green("\nDone!"));
     }).pipe(
-      Effect39.provide(clientsLayer),
+      Effect41.provide(clientsLayer),
       Logger3.withMinimumLogLevel(logLevel)
     );
-  })
-).pipe(Command3.withDescription("Delete deployed resources"));
-var cleanupLayerVersions = (input) => Effect39.gen(function* () {
+  }).pipe(Effect41.provide(ProjectConfig.Live))
+).pipe(Command3.withDescription("Delete deployed resources (Lambda, API Gateway, DynamoDB, IAM roles, layers)"));
+var cleanupLayerVersions = (input) => Effect41.gen(function* () {
   const layerName = `${input.project}-deps`;
   yield* Console5.log(`
 Searching for layer versions: ${layerName}
@@ -6702,7 +6815,7 @@ ${c.yellow("[DRY RUN]")} No layers were deleted.`);
   yield* Console5.log(c.green(`
 Deleted ${deleted} layer version(s).`));
 });
-var cleanupIamRoles = (input) => Effect39.gen(function* () {
+var cleanupIamRoles = (input) => Effect41.gen(function* () {
   yield* Console5.log("\nSearching for effortless IAM roles...\n");
   const allRoles = yield* listEffortlessRoles();
   if (allRoles.length === 0) {
@@ -6751,8 +6864,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(
-      Effect39.catchAll(
-        (error) => Effect39.logError(`Failed to delete ${role.name}: ${error}`)
+      Effect41.catchAll(
+        (error) => Effect41.logError(`Failed to delete ${role.name}: ${error}`)
       )
     );
   }
@@ -6761,7 +6874,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 Effect40, Console as Console6, Logger as Logger4, LogLevel as LogLevel4, Option as Option4, Schedule as Schedule4 } from "effect";
+import { Effect as Effect42, 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")
@@ -6832,8 +6945,8 @@ 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 }) => Effect40.gen(function* () {
-    const config = yield* Effect40.promise(loadConfig);
+  ({ handler: handlerName, project: projectOpt, stage, region, tail, since, verbose }) => Effect42.gen(function* () {
+    const { config, projectDir } = yield* ProjectConfig;
     const project = Option4.getOrElse(projectOpt, () => config?.name ?? "");
     const finalStage = config?.stage ?? stage;
     const finalRegion = config?.region ?? region;
@@ -6841,17 +6954,11 @@ var logsCommand = Command4.make(
       yield* Console6.error("Error: --project is required (or set 'name' in effortless.config.ts)");
       return;
     }
-    const projectDir = process.cwd();
     const patterns = getPatternsFromConfig(config);
     if (patterns) {
       const files = findHandlerFiles(patterns, projectDir);
       const discovered = discoverHandlers(files);
-      const allHandlerNames = [
-        ...discovered.httpHandlers.flatMap((h) => h.exports.map((e) => e.exportName)),
-        ...discovered.tableHandlers.flatMap((h) => h.exports.map((e) => e.exportName)),
-        ...discovered.appHandlers.flatMap((h) => h.exports.map((e) => e.exportName)),
-        ...discovered.fifoQueueHandlers.flatMap((h) => h.exports.map((e) => e.exportName))
-      ];
+      const allHandlerNames = flattenHandlers(discovered).map((h) => h.exportName);
       if (!allHandlerNames.includes(handlerName)) {
         yield* Console6.error(`Handler "${handlerName}" not found in code.`);
         if (allHandlerNames.length > 0) {
@@ -6869,18 +6976,18 @@ var logsCommand = Command4.make(
       cloudwatch_logs: { region: finalRegion }
     });
     const logLevel = verbose ? LogLevel4.Debug : LogLevel4.Info;
-    yield* Effect40.gen(function* () {
+    yield* Effect42.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(
-        Effect40.catchAll((error) => {
+        Effect42.catchAll((error) => {
           if (error instanceof clients_exports.cloudwatch_logs.CloudWatchLogsError && error.cause.name === "ResourceNotFoundException") {
-            return Effect40.succeed({ events: void 0, nextToken: void 0 });
+            return Effect42.succeed({ events: void 0, nextToken: void 0 });
           }
-          return Effect40.fail(error);
+          return Effect42.fail(error);
         })
       );
       if (result.events && result.events.length > 0) {
@@ -6904,10 +7011,10 @@ var logsCommand = Command4.make(
       if (!hasLogs) {
         yield* Console6.log("Waiting for logs... (Ctrl+C to stop)\n");
       }
-      yield* Effect40.repeat(
-        Effect40.gen(function* () {
+      yield* Effect42.repeat(
+        Effect42.gen(function* () {
           const result2 = yield* fetchLogs(logGroupName, startTime).pipe(
-            Effect40.catchAll(() => Effect40.succeed({ events: void 0, nextToken: void 0 }))
+            Effect42.catchAll(() => Effect42.succeed({ events: void 0, nextToken: void 0 }))
           );
           if (result2.events && result2.events.length > 0) {
             for (const event of result2.events) {
@@ -6925,16 +7032,16 @@ var logsCommand = Command4.make(
         Schedule4.spaced("2 seconds")
       );
     }).pipe(
-      Effect40.provide(clientsLayer),
+      Effect42.provide(clientsLayer),
       Logger4.withMinimumLogLevel(logLevel)
     );
-  })
-).pipe(Command4.withDescription("Show logs for a handler"));
+  }).pipe(Effect42.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 Effect41, Console as Console7 } from "effect";
-import * as path9 from "path";
+import { Effect as Effect43, Console as Console7 } from "effect";
+import * as path10 from "path";
 import * as fs5 from "fs";
 var buildOption = Options4.boolean("build").pipe(
   Options4.withDescription("Build layer directory locally (for debugging)")
@@ -6942,22 +7049,28 @@ var buildOption = Options4.boolean("build").pipe(
 var layerCommand = Command5.make(
   "layer",
   { build: buildOption, output: outputOption, verbose: verboseOption },
-  ({ build: build3, output, verbose }) => Effect41.gen(function* () {
-    const config = yield* Effect41.promise(loadConfig);
-    const projectDir = process.cwd();
+  ({ build: build3, output, verbose }) => Effect43.gen(function* () {
+    const { config, cwd } = yield* ProjectConfig;
     if (build3) {
-      yield* buildLayer(projectDir, output, verbose);
+      yield* buildLayer(cwd, output, verbose);
     } else {
-      yield* showLayerInfo(projectDir, config?.name, verbose);
+      yield* showLayerInfo(cwd, config?.name, verbose);
     }
-  })
-).pipe(Command5.withDescription("Show or build the dependency layer"));
-var showLayerInfo = (projectDir, projectName, verbose) => Effect41.gen(function* () {
+  }).pipe(Effect43.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* () {
   yield* Console7.log(`
 ${c.bold("=== Layer Packages Preview ===")}
 `);
+  const depWarnings = yield* checkDependencyWarnings(projectDir).pipe(
+    Effect43.catchAll(() => Effect43.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(
-    Effect41.catchAll(() => Effect41.succeed([]))
+    Effect43.catchAll(() => Effect43.succeed([]))
   );
   if (prodDeps.length === 0) {
     yield* Console7.log("No production dependencies found in package.json");
@@ -6969,7 +7082,7 @@ ${c.bold("=== Layer Packages Preview ===")}
     yield* Console7.log(`  ${dep}`);
   }
   const hash = yield* computeLockfileHash(projectDir).pipe(
-    Effect41.catchAll(() => Effect41.succeed(null))
+    Effect43.catchAll(() => Effect43.succeed(null))
   );
   if (hash) {
     yield* Console7.log(`
@@ -6977,7 +7090,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* Effect41.sync(() => collectLayerPackages(projectDir, prodDeps));
+  const { packages: allPackages, warnings: layerWarnings } = yield* Effect43.sync(() => collectLayerPackages(projectDir, prodDeps));
   if (layerWarnings.length > 0) {
     yield* Console7.log(c.yellow(`
 Warnings (${layerWarnings.length}):`));
@@ -7006,10 +7119,10 @@ Total packages for layer ${c.dim(`(${allPackages.length})`)}:`);
 Layer name: ${projectName}-deps`);
   }
 });
-var buildLayer = (projectDir, output, verbose) => Effect41.gen(function* () {
-  const outputDir = path9.isAbsolute(output) ? output : path9.resolve(projectDir, output);
-  const layerDir = path9.join(outputDir, "nodejs", "node_modules");
-  const layerRoot = path9.join(outputDir, "nodejs");
+var buildLayer = (projectDir, output, verbose) => Effect43.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");
   if (fs5.existsSync(layerRoot)) {
     fs5.rmSync(layerRoot, { recursive: true });
   }
@@ -7017,8 +7130,15 @@ var buildLayer = (projectDir, output, verbose) => Effect41.gen(function* () {
   yield* Console7.log(`
 ${c.bold("=== Building Layer Locally ===")}
 `);
+  const depWarnings = yield* checkDependencyWarnings(projectDir).pipe(
+    Effect43.catchAll(() => Effect43.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(
-    Effect41.catchAll(() => Effect41.succeed([]))
+    Effect43.catchAll(() => Effect43.succeed([]))
   );
   if (prodDeps.length === 0) {
     yield* Console7.log("No production dependencies found in package.json");
@@ -7030,11 +7150,11 @@ ${c.bold("=== Building Layer Locally ===")}
     yield* Console7.log(`  ${dep}`);
   }
   const hash = yield* computeLockfileHash(projectDir).pipe(
-    Effect41.catchAll(() => Effect41.succeed("unknown"))
+    Effect43.catchAll(() => Effect43.succeed("unknown"))
   );
   yield* Console7.log(`
 Lockfile hash: ${hash}`);
-  const { packages: allPackages, resolvedPaths, warnings: layerWarnings } = yield* Effect41.sync(() => collectLayerPackages(projectDir, prodDeps));
+  const { packages: allPackages, resolvedPaths, warnings: layerWarnings } = yield* Effect43.sync(() => collectLayerPackages(projectDir, prodDeps));
   if (layerWarnings.length > 0) {
     yield* Console7.log(`
 Warnings (${layerWarnings.length}):`);
@@ -7061,9 +7181,9 @@ Collected ${allPackages.length} packages for layer`);
       }
       continue;
     }
-    const destPath = path9.join(layerDir, pkgName);
+    const destPath = path10.join(layerDir, pkgName);
     if (pkgName.startsWith("@")) {
-      const scopeDir = path9.join(layerDir, pkgName.split("/")[0] ?? pkgName);
+      const scopeDir = path10.join(layerDir, pkgName.split("/")[0] ?? pkgName);
       if (!fs5.existsSync(scopeDir)) {
         fs5.mkdirSync(scopeDir, { recursive: true });
       }
@@ -7084,20 +7204,20 @@ 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 Effect42, Console as Console8, Logger as Logger5, LogLevel as LogLevel5, Option as Option5 } from "effect";
-var loadRequiredParams = (projectOpt, stage, region) => Effect42.gen(function* () {
-  const config = yield* Effect42.promise(loadConfig);
+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* () {
+  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* Effect42.fail(new Error("Missing project name"));
+    return yield* Effect44.fail(new Error("Missing project name"));
   }
   const patterns = getPatternsFromConfig(config);
   if (!patterns) {
     yield* Console8.error("Error: No 'handlers' patterns in config");
-    return yield* Effect42.fail(new Error("Missing handler patterns"));
+    return yield* Effect44.fail(new Error("Missing handler patterns"));
   }
-  const files = findHandlerFiles(patterns, process.cwd());
+  const files = findHandlerFiles(patterns, projectDir);
   const handlers = discoverHandlers(files);
   const finalStage = config?.stage ?? stage;
   const finalRegion = config?.region ?? region;
@@ -7107,7 +7227,7 @@ var loadRequiredParams = (projectOpt, stage, region) => Effect42.gen(function* (
 var listCommand = Command6.make(
   "list",
   { project: projectOption, stage: stageOption, region: regionOption, verbose: verboseOption },
-  ({ project: projectOpt, stage, region, verbose }) => Effect42.gen(function* () {
+  ({ project: projectOpt, stage, region, verbose }) => Effect44.gen(function* () {
     const ctx = yield* loadRequiredParams(projectOpt, stage, region);
     const { params } = ctx;
     if (params.length === 0) {
@@ -7115,7 +7235,7 @@ var listCommand = Command6.make(
       return;
     }
     const { existing, missing } = yield* checkMissingParams(params).pipe(
-      Effect42.provide(clients_exports.makeClients({ ssm: { region: ctx.region } }))
+      Effect44.provide(clients_exports.makeClients({ ssm: { region: ctx.region } }))
     );
     yield* Console8.log(`
 ${c.bold("Config parameters")} ${c.dim(`(${ctx.project} / ${ctx.stage})`)}
@@ -7138,16 +7258,19 @@ ${c.bold("Config parameters")} ${c.dim(`(${ctx.project} / ${ctx.stage})`)}
   ${c.green("All parameters are set.")}`);
     }
     yield* Console8.log("");
-  }).pipe(Logger5.withMinimumLogLevel(LogLevel5.Warning))
-).pipe(Command6.withDescription("List all config parameters and their status"));
+  }).pipe(
+    Effect44.provide(ProjectConfig.Live),
+    Logger5.withMinimumLogLevel(LogLevel5.Warning)
+  )
+).pipe(Command6.withDescription("List all declared config parameters and show which are set vs missing"));
 var setKeyArg = Args3.text({ name: "key" }).pipe(
   Args3.withDescription("SSM parameter key (e.g. stripe/secret-key)")
 );
 var setCommand = Command6.make(
   "set",
   { key: setKeyArg, project: projectOption, stage: stageOption, region: regionOption, verbose: verboseOption },
-  ({ key, project: projectOpt, stage, region, verbose }) => Effect42.gen(function* () {
-    const config = yield* Effect42.promise(loadConfig);
+  ({ key, project: projectOpt, stage, region, verbose }) => Effect44.gen(function* () {
+    const { config } = 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)");
@@ -7164,15 +7287,18 @@ var setCommand = Command6.make(
       Value: value,
       Type: "SecureString",
       Overwrite: true
-    }).pipe(Effect42.provide(clients_exports.makeClients({ ssm: { region: finalRegion } })));
+    }).pipe(Effect44.provide(clients_exports.makeClients({ ssm: { region: finalRegion } })));
     yield* Console8.log(`
   ${c.green("\u2713")} ${c.cyan(ssmPath)} ${c.dim("(SecureString)")}`);
-  }).pipe(Logger5.withMinimumLogLevel(LogLevel5.Warning))
-).pipe(Command6.withDescription("Set a specific config parameter value"));
+  }).pipe(
+    Effect44.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 }) => Effect42.gen(function* () {
+  ({ project: projectOpt, stage, region, verbose }) => Effect44.gen(function* () {
     const ctx = yield* loadRequiredParams(projectOpt, stage, region);
     const { params } = ctx;
     if (params.length === 0) {
@@ -7180,7 +7306,7 @@ var configRootCommand = Command6.make(
       return;
     }
     const { missing } = yield* checkMissingParams(params).pipe(
-      Effect42.provide(clients_exports.makeClients({ ssm: { region: ctx.region } }))
+      Effect44.provide(clients_exports.makeClients({ ssm: { region: ctx.region } }))
     );
     if (missing.length === 0) {
       yield* Console8.log(`
@@ -7205,7 +7331,7 @@ ${c.bold("Missing parameters")} ${c.dim(`(${ctx.project} / ${ctx.stage})`)}
         Value: value,
         Type: "SecureString",
         Overwrite: false
-      }).pipe(Effect42.provide(clients_exports.makeClients({ ssm: { region: ctx.region } })));
+      }).pipe(Effect44.provide(clients_exports.makeClients({ ssm: { region: ctx.region } })));
       yield* Console8.log(`  ${c.green("\u2713")} created`);
       created++;
     }
@@ -7218,9 +7344,12 @@ ${c.bold("Missing parameters")} ${c.dim(`(${ctx.project} / ${ctx.stage})`)}
   No parameters created.
 `);
     }
-  }).pipe(Logger5.withMinimumLogLevel(LogLevel5.Warning))
+  }).pipe(
+    Effect44.provide(ProjectConfig.Live),
+    Logger5.withMinimumLogLevel(LogLevel5.Warning)
+  )
 ).pipe(
-  Command6.withDescription("Manage SSM config parameters for your handlers"),
+  Command6.withDescription("Manage config values declared via param() in handlers. Run without subcommand to interactively set missing values"),
   Command6.withSubcommands([listCommand, setCommand])
 );
 var configCommand = configRootCommand;
@@ -7237,6 +7366,7 @@ var cli = Command7.run(mainCommand, {
   version
 });
 cli(process.argv).pipe(
-  Effect43.provide(NodeContext.layer),
+  Effect45.provide(NodeContext.layer),
+  Effect45.provide(CliConfig.layer({ showBuiltIns: false, showTypes: false })),
   NodeRuntime.runMain
 );