alchemy 2.0.0-beta.77 → 2.0.0-beta.78

package/src/Alchemist/Session.ts

@@ -29,20 +29,20 @@ import { NeonAuth } from "../Neon/AuthProvider.ts";
 import { PlanetscaleAuth } from "../Planetscale/AuthProvider.ts";
 import { PrismaAuth } from "../Prisma/AuthProvider.ts";
 import { RailwayAuth } from "../Railway/AuthProvider.ts";
+import { StripeAuth } from "../Stripe/AuthProvider.ts";
 import * as Stack from "../Stack.ts";
 import { Stage } from "../Stage.ts";
 import { Progress } from "./Progress.ts";
-import { UserFacingError } from "../UserFacingError.ts";
 import { loadConfigProvider } from "../Util/ConfigProvider.ts";
 import { fileLogger } from "../Util/FileLogger.ts";
 
-export class StackEntrypointError extends Data.TaggedError(
-  "StackEntrypointError",
-)<{ readonly message: string }> {
-  readonly [UserFacingError] = true;
-}
+import {
+  DEFAULT_ENTRYPOINT,
+  resolveStackEntrypoint,
+  StackEntrypointError,
+} from "./Entrypoint.ts";
 
-export const DEFAULT_ENTRYPOINT = "alchemy.run.ts";
+export { DEFAULT_ENTRYPOINT, resolveStackEntrypoint, StackEntrypointError };
 
 /** Stage used by routes that inspect a project without addressing a deployment. */
 export const PLACEHOLDER_STAGE = "placeholder";
@@ -69,16 +69,7 @@ export const StackModuleLoader = Context.Reference<StackModuleLoader>(
 );
 
 export const importStack = Effect.fn(function* (main: string) {
-  const fs = yield* FileSystem.FileSystem;
-  const path = yield* Path.Path;
-  const absolutePath = path.resolve(main);
-  if (!(yield* fs.exists(absolutePath))) {
-    return yield* Effect.fail(
-      new StackEntrypointError({
-        message: `Stack entrypoint '${main}' does not exist in '${path.dirname(absolutePath)}'. Run this command from an Alchemy project, pass --config <path>, or use --backend aws / --backend cloudflare for config-less state access.`,
-      }),
-    );
-  }
+  const absolutePath = yield* resolveStackEntrypoint(main);
   const loader = yield* StackModuleLoader;
   const module = yield* Effect.promise(() =>
     loader.import(pathToFileURL(absolutePath).href),
@@ -376,6 +367,7 @@ const builtinAuth = Layer.mergeAll(
   PlanetscaleAuth,
   PrismaAuth,
   RailwayAuth,
+  StripeAuth,
 );
 
 const buildBuiltinAuthProviders = Effect.fn("buildBuiltinAuthProviders")(

package/src/Alchemist/routes/nuke.ts

@@ -52,7 +52,7 @@ export const scan = Effect.fn("Alchemist.nuke.scan")(function* (
   input: ScanInput,
 ) {
   const report = withSpanEvents(yield* Progress);
-  const debug = yield* Config.string("DEBUG").pipe(
+  const debug = yield* Config.String("DEBUG").pipe(
     Config.withDefault(""),
     Effect.map((value) => value.length > 0),
   );

package/src/Alchemist/routes/state.ts

@@ -8,7 +8,7 @@ import * as AwsState from "../../AWS/StateStore/State.ts";
 import * as CloudflareState from "../../Cloudflare/StateStore/State.ts";
 import * as State from "../../State/index.ts";
 import { loadConfigProvider } from "../../Util/ConfigProvider.ts";
-import { open, type Target } from "../Session.ts";
+import { open, StackEntrypointError, type Target } from "../Session.ts";
 
 /** Which store a state request addresses. */
 export type StateSource =
@@ -68,7 +68,20 @@ export const store = Effect.fn("Alchemist.state.store")(function* (
       Effect.provide(config),
     );
   }
-  const session = yield* open(source);
+  // The configured store lives in the stack entrypoint; this is the one
+  // command that can also work without one.
+  const session = yield* open(source).pipe(
+    Effect.catchIf(
+      (error): error is StackEntrypointError =>
+        error instanceof StackEntrypointError,
+      (error) =>
+        Effect.fail(
+          new StackEntrypointError({
+            message: `${error.message} For config-less state access use --backend aws or --backend cloudflare.`,
+          }),
+        ),
+    ),
+  );
   return yield* Effect.provide(Effect.flatten(State.State), session.context);
 });
 

package/src/Auth/AuthProvider.ts

@@ -149,7 +149,7 @@ export const presentEnvironment = (
     for (const variable of environment) {
       let found: string | undefined;
       for (const name of [variable.name, ...(variable.alternatives ?? [])]) {
-        const value = yield* Config.option(Config.string(name));
+        const value = yield* Config.option(Config.String(name));
         if (Option.isSome(value) && value.value !== "") {
           found = name;
           break;

package/src/Auth/Demand.ts

@@ -280,7 +280,7 @@ export const demandCredentials = Effect.fn("Alchemy.demandCredentials")(
       yield* Effect.serviceOption(ProfileStore),
     );
     if (registry === undefined || profile === undefined) return;
-    const ci = yield* Config.boolean("CI").pipe(Config.withDefault(false));
+    const ci = yield* Config.Boolean("CI").pipe(Config.withDefault(false));
     // CI credentials come exclusively from the environment. Do not require
     // or inspect a local profile first: CI runners intentionally have no
     // profile manifest, and doing so would also risk consulting a developer's

package/src/Auth/Env.ts

@@ -5,7 +5,7 @@ import * as Interaction from "../Interaction.ts";
 import { AuthError } from "./AuthProvider.ts";
 
 export const getEnv = (key: string) =>
-  Config.option(Config.string(key)).pipe(
+  Config.option(Config.String(key)).pipe(
     Effect.map(Option.getOrUndefined),
     Effect.mapError(
       (cause) =>
@@ -17,7 +17,7 @@ export const getEnv = (key: string) =>
   );
 
 export const getEnvRequired = (key: string) =>
-  Config.string(key).pipe(
+  Config.String(key).pipe(
     Effect.mapError(
       (cause) =>
         new AuthError({ message: `Missing required env: ${key}`, cause }),
@@ -25,7 +25,7 @@ export const getEnvRequired = (key: string) =>
   );
 
 export const getEnvRedacted = (key: string) =>
-  Config.option(Config.redacted(key)).pipe(
+  Config.option(Config.Redacted(key)).pipe(
     Effect.map(Option.getOrUndefined),
     Effect.mapError(
       (cause) =>
@@ -37,7 +37,7 @@ export const getEnvRedacted = (key: string) =>
   );
 
 export const getEnvRedactedRequired = (key: string) =>
-  Config.redacted(key).pipe(
+  Config.Redacted(key).pipe(
     Effect.mapError(
       (cause) =>
         new AuthError({ message: `Missing required env: ${key}`, cause }),

package/src/Auth/Lock.ts

@@ -74,18 +74,29 @@ const acquireFileLock = Effect.fn(function* (
 
   // A non-recursive mkdir is the atomic test-and-set; the owner marker lets
   // release and refresh verify the lock wasn't reaped and re-taken.
-  yield* fs.makeDirectory(lockPath).pipe(
-    Effect.andThen(
-      fs
-        .writeFileString(ownerPath, owner)
-        .pipe(
-          Effect.onError(() =>
-            fs
-              .remove(lockPath, { recursive: true, force: true })
-              .pipe(Effect.ignore),
-          ),
+  yield* Effect.acquireRelease(
+    fs
+      .makeDirectory(lockPath)
+      .pipe(
+        Effect.andThen(
+          fs
+            .writeFileString(ownerPath, owner)
+            .pipe(
+              Effect.onError(() =>
+                fs
+                  .remove(lockPath, { recursive: true, force: true })
+                  .pipe(Effect.ignore),
+              ),
+            ),
         ),
-    ),
+      ),
+    () =>
+      fs.readFileString(ownerPath).pipe(
+        Effect.filterOrFail((current) => current === owner),
+        Effect.andThen(fs.remove(lockPath, { recursive: true, force: true })),
+        Effect.ignore,
+      ),
+  ).pipe(
     Effect.catchReason("PlatformError", "AlreadyExists", () =>
       reapStale.pipe(Effect.andThen(Effect.fail(new LockHeld()))),
     ),
@@ -109,14 +120,6 @@ const acquireFileLock = Effect.fn(function* (
     ),
   );
 
-  yield* Effect.addFinalizer(() =>
-    fs.readFileString(ownerPath).pipe(
-      Effect.filterOrFail((current) => current === owner),
-      Effect.andThen(fs.remove(lockPath, { recursive: true, force: true })),
-      Effect.ignore,
-    ),
-  );
-
   yield* fs.readFileString(ownerPath).pipe(
     Effect.filterOrFail((current) => current === owner),
     Effect.andThen(

package/src/Auth/Profile.ts

@@ -35,7 +35,7 @@ export {
 } from "./Paths.ts";
 
 /** Config key selecting a directory under `~/.alchemy/profiles`. */
-export const ALCHEMY_PROFILE = Config.string("ALCHEMY_PROFILE");
+export const ALCHEMY_PROFILE = Config.String("ALCHEMY_PROFILE");
 
 /** Version of the synthesized in-memory manifest returned by readManifest. */
 export const PROFILE_MANIFEST_VERSION = 3;

package/src/Auth/Resolve.ts

@@ -78,7 +78,7 @@ export const resolveProviderConfig = <
         };
       }
     }
-    const ci = yield* Config.boolean("CI").pipe(Config.withDefault(false));
+    const ci = yield* Config.Boolean("CI").pipe(Config.withDefault(false));
     if (ci) {
       if (auth.readEnvironment === undefined) {
         return yield* Effect.fail(

package/src/Cli/LoggingCli.ts

@@ -214,7 +214,7 @@ export const LoggingCli = Layer.effect(
     // (no requirements on the returned Effects).
     const promptContext = yield* Effect.context<Prompt.Environment>();
     const confirm = (options: Prompt.ConfirmOptions) =>
-      Prompt.confirm(options).pipe(
+      Prompt.Confirm(options).pipe(
         Effect.catchTag("QuitError", () => Effect.succeed(false)),
         Effect.provideContext(promptContext),
       );

package/src/Cli/commands/aws.ts

@@ -9,13 +9,13 @@ import { confirmOrDecline } from "./confirm.ts";
 import { envFile, yes } from "./flags.ts";
 import { instrumentCommand } from "./instrument.ts";
 
-const awsProfile = Flag.string("aws-profile").pipe(
+const awsProfile = Flag.String("aws-profile").pipe(
   Flag.withDescription("AWS CLI/SSO profile to use for bootstrap credentials"),
   Flag.optional,
   Flag.map(Option.getOrElse(() => "default")),
 );
 
-const awsRegion = Flag.string("region").pipe(
+const awsRegion = Flag.String("region").pipe(
   Flag.withDescription(
     "AWS region to bootstrap (defaults to AWS_REGION env var)",
   ),

package/src/Cli/commands/cloudflare.ts

@@ -47,7 +47,7 @@ export const formatCreatedCloudflareToken = (
     ),
   ].join("\n");
 
-const cloudflareForce = Flag.boolean("force").pipe(
+const cloudflareForce = Flag.Boolean("force").pipe(
   Flag.withDescription(
     "Force a full redeploy even if the state-store worker already exists. " +
       "Without this flag, an existing worker is adopted and only its credentials are refreshed.",
@@ -55,7 +55,7 @@ const cloudflareForce = Flag.boolean("force").pipe(
   Flag.withDefault(false),
 );
 
-const cloudflareWorkerName = Flag.string("worker-name").pipe(
+const cloudflareWorkerName = Flag.String("worker-name").pipe(
   Flag.withDescription(
     "Override the default state-store worker name (advanced; only needed for multiple state stores per account).",
   ),
@@ -132,7 +132,7 @@ const teardownCommand = Command.make(
   Command.withDescription("Tear down the Cloudflare state store"),
   Command.unlisted,
 );
-const allPermissionsFlag = Flag.boolean("all-permissions").pipe(
+const allPermissionsFlag = Flag.Boolean("all-permissions").pipe(
   Flag.withDescription(
     "Grant the token EVERY Cloudflare permission group (a 'god token'). " +
       "Use with care — it has full access to your account.",
@@ -140,7 +140,7 @@ const allPermissionsFlag = Flag.boolean("all-permissions").pipe(
   Flag.withDefault(false),
 );
 
-const tokenNameFlag = Flag.string("name").pipe(
+const tokenNameFlag = Flag.String("name").pipe(
   Flag.withDescription(
     "Name for the API token. Defaults to 'alchemy' (or 'alchemy-all-permissions').",
   ),
@@ -148,7 +148,7 @@ const tokenNameFlag = Flag.string("name").pipe(
   Flag.map(Option.getOrUndefined),
 );
 
-const tokenAccountIdFlag = Flag.string("account-id").pipe(
+const tokenAccountIdFlag = Flag.String("account-id").pipe(
   Flag.withDescription(
     "Cloudflare account ID(s) to scope the token to (comma-separated for " +
       "multiple). If omitted, you'll be prompted to select from your accounts.",
@@ -217,7 +217,7 @@ const createTokenCommand = Command.make(
         );
       const apiKey =
         (yield* read(
-          Config.string("CLOUDFLARE_API_KEY").pipe(Config.option),
+          Config.String("CLOUDFLARE_API_KEY").pipe(Config.option),
         )) ??
         (yield* prompt.prompt.password({
           message:
@@ -226,7 +226,7 @@ const createTokenCommand = Command.make(
             value.trim().length === 0 ? "Required" : undefined,
         }));
       const email =
-        (yield* read(Config.string("CLOUDFLARE_EMAIL").pipe(Config.option))) ??
+        (yield* read(Config.String("CLOUDFLARE_EMAIL").pipe(Config.option))) ??
         (yield* prompt.prompt.text({
           message: "Cloudflare account email",
           validate: (value) =>
@@ -307,7 +307,7 @@ const createTokenCommand = Command.make(
   ),
 ).pipe(Command.withDescription("Create a scoped Cloudflare API token"));
 
-const tailFlag = Flag.boolean("tail").pipe(
+const tailFlag = Flag.Boolean("tail").pipe(
   Flag.withAlias("t"),
   Flag.withDescription(
     "Stream logs in real time via the Cloudflare tail websocket instead of fetching past entries.",
@@ -315,12 +315,12 @@ const tailFlag = Flag.boolean("tail").pipe(
   Flag.withDefault(false),
 );
 
-const limitFlag = Flag.integer("limit").pipe(
+const limitFlag = Flag.Int("limit").pipe(
   Flag.withDescription("Number of log entries to fetch (ignored with --tail)"),
   Flag.withDefault(100),
 );
 
-const sinceFlag = Flag.string("since").pipe(
+const sinceFlag = Flag.String("since").pipe(
   Flag.withDescription(
     "Fetch logs since this time (e.g. '1h', '30m', '2024-01-01T00:00:00Z')",
   ),

package/src/Cli/commands/deploy.ts

@@ -51,7 +51,7 @@ const stackSpanAttrs = (args: StackCommandOptions) => ({
   "alchemy.detect_drift": !!args.detectDrift,
 });
 
-const adopt = Flag.boolean("adopt").pipe(
+const adopt = Flag.Boolean("adopt").pipe(
   Flag.withDescription(
     "Adopt pre-existing cloud resources that conflict with this stack instead of failing. " +
       "Useful for re-importing infrastructure into a fresh state store.",
@@ -59,12 +59,12 @@ const adopt = Flag.boolean("adopt").pipe(
   Flag.withDefault(false),
 );
 
-const detailed = Flag.boolean("detailed").pipe(
+const detailed = Flag.Boolean("detailed").pipe(
   Flag.withDescription("Show declared resource properties as YAML"),
   Flag.withDefault(false),
 );
 
-const detectDrift = Flag.boolean("detect-drift").pipe(
+const detectDrift = Flag.Boolean("detect-drift").pipe(
   Flag.withDescription(
     "Detect infrastructure drift and offer to repair it before deploying",
   ),

package/src/Cli/commands/dev.ts

@@ -8,6 +8,7 @@ import * as ChildProcess from "effect/unstable/process/ChildProcess";
 import { fileURLToPath } from "node:url";
 import { SPAWNER_URL_ENV_KEY } from "../../Local/RpcProviderProxy.ts";
 import * as RpcSpawner from "../../Local/RpcSpawner.ts";
+import { resolveStackEntrypoint } from "../../Alchemist/Entrypoint.ts";
 import { nodeLoaderArgs } from "../../Util/Node.ts";
 import { DEV_RELOAD_EXIT_CODE, DevOptions } from "../DevOptions.ts";
 import {
@@ -20,6 +21,7 @@ import {
   resolveStackArgs,
 } from "./flags.ts";
 import { suppressInterruptMessages } from "./errors.ts";
+import { moduleExtension } from "alchemy/Util/Node";
 
 /**
  * Trust the Floci emulator CA in `alchemy dev` so cross-cloud data planes
@@ -51,6 +53,9 @@ export const devCommand = Command.make(
       // hits both processes and the interrupt message prints twice.
       yield* suppressInterruptMessages;
       const options = yield* Schema.encodeEffect(DevOptions)(args);
+      // A missing entry is this process's error to report, not a stack
+      // trace out of the exec child.
+      yield* resolveStackEntrypoint(options.main);
       const fs = yield* FileSystem.FileSystem;
       // Set on THIS process too, so the RPC spawner's sidecars (and the workerd
       // they launch) inherit it — they are forked from here, not from the exec
@@ -84,9 +89,7 @@ export const devCommand = Command.make(
         // second import of the same URL hits the module cache.
         const entry = fileURLToPath(
           import.meta.resolve(
-            import.meta.url.endsWith(".ts")
-              ? "alchemy/bin/exec.ts"
-              : "alchemy/bin/exec.js",
+            `alchemy/bin/exec${moduleExtension(import.meta.url)}`,
           ),
         );
         command = [

package/src/Cli/commands/drift.ts

@@ -12,7 +12,7 @@ import { config, envFile, profile, resolveStage, stage } from "./flags.ts";
 import { instrumentCommand } from "./instrument.ts";
 import { renderApply, renderPlanning } from "./render.ts";
 
-const repairFlag = Flag.boolean("repair").pipe(
+const repairFlag = Flag.Boolean("repair").pipe(
   Flag.withDescription("Repair detected drift without prompting"),
   Flag.withDefault(false),
 );

package/src/Cli/commands/flags.ts

@@ -10,12 +10,19 @@ import * as Flag from "effect/unstable/cli/Flag";
 import { loadConfigProvider } from "../../Util/ConfigProvider.ts";
 import { UserInputError } from "./errors.ts";
 
-export const USER = Config.string("USER").pipe(
-  Config.orElse(() => Config.string("USERNAME")),
+export const USER = Config.String("USER").pipe(
+  Config.orElse(() => Config.String("USERNAME")),
   Config.withDefault("unknown"),
 );
 
-export const ALCHEMY_STAGE = Config.string("ALCHEMY_STAGE").pipe(
+/** `live_$USER`, `dev_$USER`, or `test_$USER` (falls back to `*_unknown`). */
+export const userStage = (kind: "live" | "dev" | "test") =>
+  USER.pipe(
+    Effect.map((user) => `${kind}_${user}`),
+    Effect.catch(() => Effect.succeed(`${kind}_unknown`)),
+  );
+
+export const ALCHEMY_STAGE = Config.String("ALCHEMY_STAGE").pipe(
   Config.option,
   Effect.map(Option.getOrUndefined),
 );
@@ -23,7 +30,7 @@ export const ALCHEMY_STAGE = Config.string("ALCHEMY_STAGE").pipe(
 const STAGE_NAME_PATTERN = /^[a-z0-9]+([-_a-z0-9]+)*$/i;
 
 const makeStageFlag = (kind: "live" | "dev") =>
-  Flag.string("stage").pipe(
+  Flag.String("stage").pipe(
     Flag.withSchema(
       Schema.String.check(Schema.isPattern(/^[a-z0-9]+([-_a-z0-9]+)*$/gi)),
     ),
@@ -69,51 +76,48 @@ export const resolveStage = Effect.fn(function* (
     }
     return configured;
   }
-  return yield* USER.pipe(
-    Effect.map((user) => `${kind}_${user}`),
-    Effect.catch(() => Effect.succeed(`${kind}_unknown`)),
-  );
+  return yield* userStage(kind);
 });
 
-export const envFile = Flag.file("env-file").pipe(
+export const envFile = Flag.File("env-file").pipe(
   Flag.optional,
   Flag.withDescription(
     "File to load environment variables from, defaults to .env",
   ),
 );
 
-export const dryRun = Flag.boolean("dry-run").pipe(
+export const dryRun = Flag.Boolean("dry-run").pipe(
   Flag.withDescription("Dry run the deployment, do not actually deploy"),
   Flag.withDefault(false),
 );
 
-export const yes = Flag.boolean("yes").pipe(
+export const yes = Flag.Boolean("yes").pipe(
   Flag.withAlias("y"),
   Flag.withDescription("Yes to all prompts"),
   Flag.withDefault(false),
 );
 
-export const force = Flag.boolean("force").pipe(
+export const force = Flag.Boolean("force").pipe(
   Flag.withDescription(
     "Force updates for resources that would otherwise no-op",
   ),
   Flag.withDefault(false),
 );
 
-export const config = Flag.file("config", { mustExist: true }).pipe(
+export const config = Flag.File("config", { mustExist: true }).pipe(
   Flag.withDescription("Alchemy entrypoint file (default: alchemy.run.ts)"),
   Flag.withAlias("c"),
   Flag.withDefault("alchemy.run.ts"),
 );
 
-export const optionalConfig = Flag.file("config", { mustExist: true }).pipe(
+export const optionalConfig = Flag.File("config", { mustExist: true }).pipe(
   Flag.withDescription("Alchemy entrypoint file (default: alchemy.run.ts)"),
   Flag.withAlias("c"),
   Flag.optional,
   Flag.map(Option.getOrUndefined),
 );
 
-export const configPath = Argument.file("config", { mustExist: true }).pipe(
+export const configPath = Argument.File("config", { mustExist: true }).pipe(
   Argument.withDescription("Alchemy entrypoint file (default: alchemy.run.ts)"),
   Argument.optional,
   Argument.map(Option.getOrUndefined),
@@ -158,7 +162,7 @@ export const resolveStackArgs =
       return { ...resolved, stage };
     });
 
-export const profile = Flag.string("profile").pipe(
+export const profile = Flag.String("profile").pipe(
   Flag.withDescription(
     "Auth profile to use. Defaults to $ALCHEMY_PROFILE or 'default'.",
   ),

package/src/Cli/commands/instrument.ts

@@ -1,6 +1,14 @@
 import * as Effect from "effect/Effect";
+import { routeCacheLayer } from "../../Alchemist/Session.ts";
 import { recordCli } from "../../Telemetry/Metrics.ts";
 
+/**
+ * Wraps a command handler as one traced, metered unit that is also one
+ * route-cache scope: the stack sessions and auth registries its routes open
+ * are memoized for the command's duration (`routeCacheLayer`). Commands that
+ * never open a session (`dev`, which only supervises the exec child) stay
+ * off this wrapper and therefore never load `Alchemist/Session`.
+ */
 export const instrumentCommand =
   <AttrsArgs = unknown>(
     command: string,
@@ -15,4 +23,5 @@ export const instrumentCommand =
         attributes: attrs ? attrs(args) : {},
       }),
       recordCli(command),
+      Effect.provide(routeCacheLayer),
     );

package/src/Cli/commands/logs.ts

@@ -17,18 +17,18 @@ import {
 } from "./flags.ts";
 import { instrumentCommand } from "./instrument.ts";
 
-const logsLimit = Flag.integer("limit").pipe(
+const logsLimit = Flag.Int("limit").pipe(
   Flag.withDescription("Number of log entries to fetch (default: 100)"),
   Flag.withDefault(100),
 );
 
-const tail = Flag.boolean("tail").pipe(
+const tail = Flag.Boolean("tail").pipe(
   Flag.withAlias("t"),
   Flag.withDescription("Continue streaming new log entries"),
   Flag.withDefault(false),
 );
 
-const resources = Flag.string("resource").pipe(
+const resources = Flag.String("resource").pipe(
   Flag.withAlias("r"),
   Flag.withDescription(
     "Comma-separated logical resource IDs to include (for example Worker,Api)",
@@ -37,7 +37,7 @@ const resources = Flag.string("resource").pipe(
   Flag.map(Option.getOrUndefined),
 );
 
-const logsSince = Flag.string("since").pipe(
+const logsSince = Flag.String("since").pipe(
   Flag.withDescription(
     "Fetch logs since this time (e.g. '1h', '30m', '2024-01-01T00:00:00Z')",
   ),

package/src/Cli/commands/nuke.ts

@@ -23,45 +23,45 @@ import {
 } from "./flags.ts";
 import { instrumentCommand } from "./instrument.ts";
 
-const includeFlag = Flag.string("include").pipe(
+const includeFlag = Flag.String("include").pipe(
   Flag.withDescription("Glob of provider IDs to include (repeatable)"),
   Flag.atLeast(0),
 );
-const excludeFlag = Flag.string("exclude").pipe(
+const excludeFlag = Flag.String("exclude").pipe(
   Flag.withDescription("Glob of provider IDs to exclude (repeatable)"),
   Flag.atLeast(0),
 );
-const filterFlag = Flag.string("filter").pipe(
+const filterFlag = Flag.String("filter").pipe(
   Flag.withDescription(
     "JavaScript expression evaluated with resource in scope; matching resources are excluded from deletion (repeatable)",
   ),
   Flag.atLeast(0),
 );
-const concurrencyFlag = Flag.integer("concurrency").pipe(
+const concurrencyFlag = Flag.Int("concurrency").pipe(
   Flag.withDescription(
     "Maximum providers processed in parallel; 0 is unbounded",
   ),
   Flag.withDefault(16),
   Flag.map((value): number | "unbounded" => (value <= 0 ? "unbounded" : value)),
 );
-const timeoutFlag = Flag.integer("timeout").pipe(
+const timeoutFlag = Flag.Int("timeout").pipe(
   Flag.withDescription("Per-provider timeout in seconds"),
   Flag.withDefault(120),
   Flag.map(Duration.seconds),
 );
-const independentFlag = Flag.boolean("independent").pipe(
+const independentFlag = Flag.Boolean("independent").pipe(
   Flag.withDescription("Retry each resource independently"),
   Flag.withDefault(false),
 );
-const retriesFlag = Flag.integer("retries").pipe(
+const retriesFlag = Flag.Int("retries").pipe(
   Flag.withDescription("Independent retries per resource"),
   Flag.withDefault(10),
 );
-const localFlag = Flag.boolean("local").pipe(
+const localFlag = Flag.Boolean("local").pipe(
   Flag.withDescription("Target only locally emulated providers"),
   Flag.withDefault(false),
 );
-const dryRunFlag = Flag.boolean("dry-run").pipe(
+const dryRunFlag = Flag.Boolean("dry-run").pipe(
   Flag.withDescription("Scan and show targets without deleting"),
   Flag.withDefault(false),
 );