airfoil 0.2.0 → 0.4.0

package/package.json

@@ -1,41 +1,36 @@
 {
   "name": "airfoil",
-  "version": "0.2.0",
-  "module": "index.ts",
-  "type": "module",
+  "version": "0.4.0",
+  "repository": "useairfoil/typescript-sdk",
+  "bin": {
+    "airfoil": "./dist/index.js"
+  },
   "files": [
     "dist",
     "src",
     "README.md"
   ],
-  "bin": {
-    "airfoil": "./dist/index.js"
-  },
+  "type": "module",
+  "module": "index.ts",
   "scripts": {
+    "build": "tsdown",
     "typecheck": "tsc --noEmit",
-    "lint": "biome check .",
-    "lint:fix": "pnpm lint --write",
-    "format": "biome format --write .",
-    "airfoil:dev": "bun run src/index.ts",
-    "build": "bun build src/index.ts --outdir dist --target node",
-    "compile": "bun build src/index.ts --compile --outfile airfoil",
-    "compile:all": "bun run src/scripts/compile-all.ts"
-  },
-  "devDependencies": {
-    "@types/bun": "^1.3.5"
-  },
-  "peerDependencies": {
-    "typescript": "^5"
+    "dev": "tsx src/index.ts"
   },
   "dependencies": {
-    "@useairfoil/flight": "0.2.0",
-    "@useairfoil/wings": "0.2.0",
     "@clack/prompts": "^0.11.0",
-    "@effect/cli": "^0.73.1",
-    "@effect/platform-node": "^0.104.1",
+    "@effect/platform-node": "4.0.0-beta.54",
+    "@useairfoil/flight": "0.4.0",
+    "@useairfoil/wings": "0.4.0",
     "console-table-printer": "^2.15.0",
-    "effect": "^3.19.15",
+    "effect": "4.0.0-beta.54",
     "nice-grpc": "^2.1.13",
     "nice-grpc-common": "^2.0.2"
+  },
+  "devDependencies": {
+    "@types/node": "^24.2.0",
+    "tsdown": "^0.15.6",
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3"
   }
 }

package/src/commands/cluster/data-lake/create-iceberg.ts

@@ -1,18 +1,18 @@
 import * as p from "@clack/prompts";
-import { Command, Options } from "@effect/cli";
 import { WingsClusterMetadata } from "@useairfoil/wings";
 import { printTable } from "console-table-printer";
 import { Effect } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
+
 import { makeClusterMetadataLayer } from "../../../utils/client.js";
-import { handleCliError } from "../../../utils/effect.js";
 import { hostOption, portOption } from "../../../utils/options.js";
 
-const parentOption = Options.text("parent").pipe(
-  Options.withDescription("Parent tenant in format: tenants/{tenant}"),
+const parentOption = Flag.string("parent").pipe(
+  Flag.withDescription("Parent tenant in format: tenants/{tenant}"),
 );
 
-const dataLakeIdOption = Options.text("data-lake-id").pipe(
-  Options.withDescription("Unique identifier for the data lake"),
+const dataLakeIdOption = Flag.string("data-lake-id").pipe(
+  Flag.withDescription("Unique identifier for the data lake"),
 );
 
 export const createDataLakeIcebergCommand = Command.make(
@@ -41,9 +41,7 @@ export const createDataLakeIcebergCommand = Command.make(
         },
       }).pipe(
         Effect.provide(layer),
-        Effect.tapError(() =>
-          Effect.sync(() => s.stop("Failed to create data lake")),
-        ),
+        Effect.tapError(() => Effect.sync(() => s.stop("Failed to create data lake"))),
       );
 
       s.stop("Iceberg data lake created successfully");
@@ -57,5 +55,5 @@ export const createDataLakeIcebergCommand = Command.make(
         ]);
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to create data lake"))),
+    }),
 ).pipe(Command.withDescription("Create a new Iceberg data lake"));

package/src/commands/cluster/data-lake/create-parquet.ts

@@ -1,18 +1,18 @@
 import * as p from "@clack/prompts";
-import { Command, Options } from "@effect/cli";
 import { WingsClusterMetadata } from "@useairfoil/wings";
 import { printTable } from "console-table-printer";
 import { Effect } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
+
 import { makeClusterMetadataLayer } from "../../../utils/client.js";
-import { handleCliError } from "../../../utils/effect.js";
 import { hostOption, portOption } from "../../../utils/options.js";
 
-const parentOption = Options.text("parent").pipe(
-  Options.withDescription("Parent tenant in format: tenants/{tenant}"),
+const parentOption = Flag.string("parent").pipe(
+  Flag.withDescription("Parent tenant in format: tenants/{tenant}"),
 );
 
-const dataLakeIdOption = Options.text("data-lake-id").pipe(
-  Options.withDescription("Unique identifier for the data lake"),
+const dataLakeIdOption = Flag.string("data-lake-id").pipe(
+  Flag.withDescription("Unique identifier for the data lake"),
 );
 
 export const createDataLakeParquetCommand = Command.make(
@@ -41,9 +41,7 @@ export const createDataLakeParquetCommand = Command.make(
         },
       }).pipe(
         Effect.provide(layer),
-        Effect.tapError(() =>
-          Effect.sync(() => s.stop("Failed to create data lake")),
-        ),
+        Effect.tapError(() => Effect.sync(() => s.stop("Failed to create data lake"))),
       );
 
       s.stop("Parquet data lake created successfully");
@@ -57,5 +55,5 @@ export const createDataLakeParquetCommand = Command.make(
         ]);
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to create data lake"))),
+    }),
 ).pipe(Command.withDescription("Create a new Parquet data lake"));

package/src/commands/cluster/data-lake/create.ts

@@ -1,16 +1,10 @@
-import { Command } from "@effect/cli";
 import { Effect } from "effect";
+import { Command } from "effect/unstable/cli";
+
 import { createDataLakeIcebergCommand } from "./create-iceberg.js";
 import { createDataLakeParquetCommand } from "./create-parquet.js";
 
-export const createDataLakeCommand = Command.make(
-  "create-data-lake",
-  {},
-  () => Effect.void,
-).pipe(
+export const createDataLakeCommand = Command.make("create-data-lake", {}, () => Effect.void).pipe(
   Command.withDescription("Create a new data lake"),
-  Command.withSubcommands([
-    createDataLakeIcebergCommand,
-    createDataLakeParquetCommand,
-  ]),
+  Command.withSubcommands([createDataLakeIcebergCommand, createDataLakeParquetCommand]),
 );

package/src/commands/cluster/data-lake/delete.ts

@@ -1,15 +1,13 @@
 import * as p from "@clack/prompts";
-import { Command, Options } from "@effect/cli";
 import { WingsClusterMetadata } from "@useairfoil/wings";
 import { Effect } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
+
 import { makeClusterMetadataLayer } from "../../../utils/client.js";
-import { handleCliError } from "../../../utils/effect.js";
 import { forceOption, hostOption, portOption } from "../../../utils/options.js";
 
-const nameOption = Options.text("name").pipe(
-  Options.withDescription(
-    "Data lake name in format: tenants/{tenant}/data-lakes/{data-lake}",
-  ),
+const nameOption = Flag.string("name").pipe(
+  Flag.withDescription("Data lake name in format: tenants/{tenant}/data-lakes/{data-lake}"),
 );
 
 export const deleteDataLakeCommand = Command.make(
@@ -47,12 +45,10 @@ export const deleteDataLakeCommand = Command.make(
 
       yield* WingsClusterMetadata.deleteDataLake({ name }).pipe(
         Effect.provide(layer),
-        Effect.tapError(() =>
-          Effect.sync(() => s.stop("Failed to delete data lake")),
-        ),
+        Effect.tapError(() => Effect.sync(() => s.stop("Failed to delete data lake"))),
       );
 
       s.stop("Data lake deleted successfully");
       p.outro("✓ Done");
-    }).pipe(Effect.catchAll(handleCliError("Failed to delete data lake"))),
+    }),
 ).pipe(Command.withDescription("Delete a data lake from the cluster"));

package/src/commands/cluster/data-lake/get.ts

@@ -1,16 +1,14 @@
 import * as p from "@clack/prompts";
-import { Command, Options } from "@effect/cli";
 import { WingsClusterMetadata } from "@useairfoil/wings";
 import { printTable } from "console-table-printer";
 import { Effect } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
+
 import { makeClusterMetadataLayer } from "../../../utils/client.js";
-import { handleCliError } from "../../../utils/effect.js";
 import { hostOption, portOption } from "../../../utils/options.js";
 
-const nameOption = Options.text("name").pipe(
-  Options.withDescription(
-    "Data lake name in format: tenants/{tenant}/data-lakes/{data-lake}",
-  ),
+const nameOption = Flag.string("name").pipe(
+  Flag.withDescription("Data lake name in format: tenants/{tenant}/data-lakes/{data-lake}"),
 );
 
 export const getDataLakeCommand = Command.make(
@@ -29,18 +27,14 @@ export const getDataLakeCommand = Command.make(
 
       const dataLake = yield* WingsClusterMetadata.getDataLake({ name }).pipe(
         Effect.provide(layer),
-        Effect.tapError(() =>
-          Effect.sync(() => s.stop("Failed to get data lake")),
-        ),
+        Effect.tapError(() => Effect.sync(() => s.stop("Failed to get data lake"))),
       );
 
       s.stop("Data lake retrieved");
 
       yield* Effect.sync(() => {
-        printTable([
-          { name: dataLake.name, type: dataLake.dataLakeConfig._tag || "-" },
-        ]);
+        printTable([{ name: dataLake.name, type: dataLake.dataLakeConfig._tag || "-" }]);
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to get data lake"))),
+    }),
 ).pipe(Command.withDescription("Get details of a specific data lake"));

package/src/commands/cluster/data-lake/list.ts

@@ -1,19 +1,14 @@
 import * as p from "@clack/prompts";
-import { Command, Options } from "@effect/cli";
 import { WingsClusterMetadata } from "@useairfoil/wings";
 import { printTable } from "console-table-printer";
 import { Effect, Option } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
+
 import { makeClusterMetadataLayer } from "../../../utils/client.js";
-import { handleCliError } from "../../../utils/effect.js";
-import {
-  hostOption,
-  pageSizeOption,
-  pageTokenOption,
-  portOption,
-} from "../../../utils/options.js";
+import { hostOption, pageSizeOption, pageTokenOption, portOption } from "../../../utils/options.js";
 
-const parentOption = Options.text("parent").pipe(
-  Options.withDescription("Parent tenant in format: tenants/{tenant}"),
+const parentOption = Flag.string("parent").pipe(
+  Flag.withDescription("Parent tenant in format: tenants/{tenant}"),
 );
 
 export const listDataLakesCommand = Command.make(
@@ -38,9 +33,7 @@ export const listDataLakesCommand = Command.make(
         pageToken: Option.getOrUndefined(pageToken),
       }).pipe(
         Effect.provide(layer),
-        Effect.tapError(() =>
-          Effect.sync(() => s.stop("Failed to list data lakes")),
-        ),
+        Effect.tapError(() => Effect.sync(() => s.stop("Failed to list data lakes"))),
       );
 
       s.stop(`Found ${response.dataLakes.length} data lake(s)`);
@@ -51,10 +44,7 @@ export const listDataLakesCommand = Command.make(
         } else {
           printTable(
             response.dataLakes.map(
-              (dataLake: {
-                name: string;
-                dataLakeConfig: { _tag?: string | null };
-              }) => ({
+              (dataLake: { name: string; dataLakeConfig: { _tag?: string | null } }) => ({
                 name: dataLake.name,
                 type: dataLake.dataLakeConfig._tag || "-",
               }),
@@ -68,5 +58,5 @@ export const listDataLakesCommand = Command.make(
 
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to list data lakes"))),
+    }),
 ).pipe(Command.withDescription("List all data lakes belonging to a tenant"));

package/src/commands/cluster/index.ts

@@ -1,5 +1,6 @@
-import { Command } from "@effect/cli";
 import { Effect } from "effect";
+import { Command } from "effect/unstable/cli";
+
 import { createDataLakeCommand } from "./data-lake/create.js";
 import { deleteDataLakeCommand } from "./data-lake/delete.js";
 import { getDataLakeCommand } from "./data-lake/get.js";
@@ -21,11 +22,7 @@ import { deleteTopicCommand } from "./topic/delete.js";
 import { getTopicCommand } from "./topic/get.js";
 import { listTopicsCommand } from "./topic/list.js";
 
-export const clusterCommand = Command.make(
-  "cluster",
-  {},
-  () => Effect.void,
-).pipe(
+export const clusterCommand = Command.make("cluster", {}, () => Effect.void).pipe(
   Command.withDescription("Interact with the cluster metadata server"),
   Command.withSubcommands([
     createTenantCommand,

package/src/commands/cluster/namespace/create.ts

@@ -1,46 +1,38 @@
 import * as p from "@clack/prompts";
-import { Command, Options } from "@effect/cli";
 import { WingsClusterMetadata } from "@useairfoil/wings";
 import { printTable } from "console-table-printer";
 import { Effect } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
+
 import { makeClusterMetadataLayer } from "../../../utils/client.js";
-import { handleCliError } from "../../../utils/effect.js";
 import { hostOption, portOption } from "../../../utils/options.js";
 
-const parentOption = Options.text("parent").pipe(
-  Options.withDescription(
-    "Parent tenant in format: tenants/{tenant} (e.g., 'tenants/default')",
-  ),
+const parentOption = Flag.string("parent").pipe(
+  Flag.withDescription("Parent tenant in format: tenants/{tenant} (e.g., 'tenants/default')"),
 );
 
-const namespaceIdOption = Options.text("namespace-id").pipe(
-  Options.withDescription(
-    "Unique identifier for the namespace (e.g., 'production')",
-  ),
+const namespaceIdOption = Flag.string("namespace-id").pipe(
+  Flag.withDescription("Unique identifier for the namespace (e.g., 'production')"),
 );
 
-const flushSizeBytesOption = Options.integer("flush-size-bytes").pipe(
-  Options.withDescription(
-    "Size at which the current segment is flushed to object storage",
-  ),
-  Options.withDefault(0),
+const flushSizeBytesOption = Flag.integer("flush-size-bytes").pipe(
+  Flag.withDescription("Size at which the current segment is flushed to object storage"),
+  Flag.withDefault(0),
 );
 
-const flushIntervalMillisOption = Options.integer("flush-interval-millis").pipe(
-  Options.withDescription(
-    "Maximum interval at which the current segment is flushed (milliseconds)",
-  ),
-  Options.withDefault(0),
+const flushIntervalMillisOption = Flag.integer("flush-interval-millis").pipe(
+  Flag.withDescription("Maximum interval at which the current segment is flushed (milliseconds)"),
+  Flag.withDefault(0),
 );
 
-const objectStoreOption = Options.text("object-store").pipe(
-  Options.withDescription(
+const objectStoreOption = Flag.string("object-store").pipe(
+  Flag.withDescription(
     "Object store used by this namespace (format: tenants/{tenant}/object-stores/{object-store})",
   ),
 );
 
-const dataLakeOption = Options.text("data-lake").pipe(
-  Options.withDescription(
+const dataLakeOption = Flag.string("data-lake").pipe(
+  Flag.withDescription(
     "Data lake used by this namespace (format: tenants/{tenant}/data-lakes/{data-lake})",
   ),
 );
@@ -84,9 +76,7 @@ export const createNamespaceCommand = Command.make(
         dataLake,
       }).pipe(
         Effect.provide(layer),
-        Effect.tapError(() =>
-          Effect.sync(() => s.stop("Failed to create namespace")),
-        ),
+        Effect.tapError(() => Effect.sync(() => s.stop("Failed to create namespace"))),
       );
 
       s.stop("Namespace created successfully");
@@ -103,5 +93,5 @@ export const createNamespaceCommand = Command.make(
         ]);
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to create namespace"))),
+    }),
 ).pipe(Command.withDescription("Create a new namespace belonging to a tenant"));

package/src/commands/cluster/namespace/delete.ts

@@ -1,15 +1,13 @@
 import * as p from "@clack/prompts";
-import { Command, Options } from "@effect/cli";
 import { WingsClusterMetadata } from "@useairfoil/wings";
 import { Effect } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
+
 import { makeClusterMetadataLayer } from "../../../utils/client.js";
-import { handleCliError } from "../../../utils/effect.js";
 import { forceOption, hostOption, portOption } from "../../../utils/options.js";
 
-const nameOption = Options.text("name").pipe(
-  Options.withDescription(
-    "Namespace name in format: tenants/{tenant}/namespaces/{namespace}",
-  ),
+const nameOption = Flag.string("name").pipe(
+  Flag.withDescription("Namespace name in format: tenants/{tenant}/namespaces/{namespace}"),
 );
 
 export const deleteNamespaceCommand = Command.make(
@@ -47,14 +45,12 @@ export const deleteNamespaceCommand = Command.make(
 
       yield* WingsClusterMetadata.deleteNamespace({ name }).pipe(
         Effect.provide(layer),
-        Effect.tapError(() =>
-          Effect.sync(() => s.stop("Failed to delete namespace")),
-        ),
+        Effect.tapError(() => Effect.sync(() => s.stop("Failed to delete namespace"))),
       );
 
       s.stop("Namespace deleted successfully");
       p.outro("✓ Done");
-    }).pipe(Effect.catchAll(handleCliError("Failed to delete namespace"))),
+    }),
 ).pipe(
   Command.withDescription(
     "Delete a namespace from the cluster (fails if namespace has any topics)",

package/src/commands/cluster/namespace/get.ts

@@ -1,16 +1,14 @@
 import * as p from "@clack/prompts";
-import { Command, Options } from "@effect/cli";
 import { WingsClusterMetadata } from "@useairfoil/wings";
 import { printTable } from "console-table-printer";
 import { Effect } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
+
 import { makeClusterMetadataLayer } from "../../../utils/client.js";
-import { handleCliError } from "../../../utils/effect.js";
 import { hostOption, portOption } from "../../../utils/options.js";
 
-const nameOption = Options.text("name").pipe(
-  Options.withDescription(
-    "Namespace name in format: tenants/{tenant}/namespaces/{namespace}",
-  ),
+const nameOption = Flag.string("name").pipe(
+  Flag.withDescription("Namespace name in format: tenants/{tenant}/namespaces/{namespace}"),
 );
 
 export const getNamespaceCommand = Command.make(
@@ -29,9 +27,7 @@ export const getNamespaceCommand = Command.make(
 
       const namespace = yield* WingsClusterMetadata.getNamespace({ name }).pipe(
         Effect.provide(layer),
-        Effect.tapError(() =>
-          Effect.sync(() => s.stop("Failed to get namespace")),
-        ),
+        Effect.tapError(() => Effect.sync(() => s.stop("Failed to get namespace"))),
       );
 
       s.stop("Namespace retrieved");
@@ -48,5 +44,5 @@ export const getNamespaceCommand = Command.make(
         ]);
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to get namespace"))),
+    }),
 ).pipe(Command.withDescription("Get details of a specific namespace"));

package/src/commands/cluster/namespace/list.ts

@@ -1,21 +1,14 @@
 import * as p from "@clack/prompts";
-import { Command, Options } from "@effect/cli";
 import { WingsClusterMetadata } from "@useairfoil/wings";
 import { printTable } from "console-table-printer";
 import { Effect, Option } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
+
 import { makeClusterMetadataLayer } from "../../../utils/client.js";
-import { handleCliError } from "../../../utils/effect.js";
-import {
-  hostOption,
-  pageSizeOption,
-  pageTokenOption,
-  portOption,
-} from "../../../utils/options.js";
+import { hostOption, pageSizeOption, pageTokenOption, portOption } from "../../../utils/options.js";
 
-const parentOption = Options.text("parent").pipe(
-  Options.withDescription(
-    "Parent tenant in format: tenants/{tenant} (e.g., 'tenants/default')",
-  ),
+const parentOption = Flag.string("parent").pipe(
+  Flag.withDescription("Parent tenant in format: tenants/{tenant} (e.g., 'tenants/default')"),
 );
 
 export const listNamespacesCommand = Command.make(
@@ -40,9 +33,7 @@ export const listNamespacesCommand = Command.make(
         pageToken: Option.getOrUndefined(pageToken),
       }).pipe(
         Effect.provide(layer),
-        Effect.tapError(() =>
-          Effect.sync(() => s.stop("Failed to list namespaces")),
-        ),
+        Effect.tapError(() => Effect.sync(() => s.stop("Failed to list namespaces"))),
       );
 
       s.stop(`Found ${response.namespaces.length} namespace(s)`);
@@ -76,5 +67,5 @@ export const listNamespacesCommand = Command.make(
 
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to list namespaces"))),
+    }),
 ).pipe(Command.withDescription("List all namespaces belonging to a tenant"));

package/src/commands/cluster/object-store/create-aws.ts

@@ -1,40 +1,40 @@
 import * as p from "@clack/prompts";
-import { Command, Options } from "@effect/cli";
 import { WingsClusterMetadata } from "@useairfoil/wings";
 import { printTable } from "console-table-printer";
 import { Effect, Option } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
+
 import { makeClusterMetadataLayer } from "../../../utils/client.js";
-import { handleCliError } from "../../../utils/effect.js";
 import { hostOption, portOption } from "../../../utils/options.js";
 
-const parentOption = Options.text("parent").pipe(
-  Options.withDescription("Parent tenant in format: tenants/{tenant}"),
+const parentOption = Flag.string("parent").pipe(
+  Flag.withDescription("Parent tenant in format: tenants/{tenant}"),
 );
 
-const objectStoreIdOption = Options.text("object-store-id").pipe(
-  Options.withDescription("Unique identifier for the object store"),
+const objectStoreIdOption = Flag.string("object-store-id").pipe(
+  Flag.withDescription("Unique identifier for the object store"),
 );
 
-const bucketNameOption = Options.text("bucket-name").pipe(
-  Options.withDescription("AWS S3 bucket name"),
+const bucketNameOption = Flag.string("bucket-name").pipe(
+  Flag.withDescription("AWS S3 bucket name"),
 );
 
-const prefixOption = Options.text("prefix").pipe(
-  Options.withDescription("Bucket prefix (optional)"),
-  Options.optional,
+const prefixOption = Flag.string("prefix").pipe(
+  Flag.withDescription("Bucket prefix (optional)"),
+  Flag.optional,
 );
 
-const accessKeyIdOption = Options.text("access-key-id").pipe(
-  Options.withDescription("AWS_ACCESS_KEY_ID"),
+const accessKeyIdOption = Flag.string("access-key-id").pipe(
+  Flag.withDescription("AWS_ACCESS_KEY_ID"),
 );
 
-const secretAccessKeyOption = Options.text("secret-access-key").pipe(
-  Options.withDescription("AWS_SECRET_ACCESS_KEY"),
+const secretAccessKeyOption = Flag.string("secret-access-key").pipe(
+  Flag.withDescription("AWS_SECRET_ACCESS_KEY"),
 );
 
-const regionOption = Options.text("region").pipe(
-  Options.withDescription("AWS_DEFAULT_REGION (e.g., us-east-1)"),
-  Options.optional,
+const regionOption = Flag.string("region").pipe(
+  Flag.withDescription("AWS_DEFAULT_REGION (e.g., us-east-1)"),
+  Flag.optional,
 );
 
 export const createObjectStoreAwsCommand = Command.make(
@@ -84,9 +84,7 @@ export const createObjectStoreAwsCommand = Command.make(
         },
       }).pipe(
         Effect.provide(layer),
-        Effect.tapError(() =>
-          Effect.sync(() => s.stop("Failed to create AWS object store")),
-        ),
+        Effect.tapError(() => Effect.sync(() => s.stop("Failed to create AWS object store"))),
       );
 
       s.stop("AWS S3 object store created successfully");
@@ -102,7 +100,5 @@ export const createObjectStoreAwsCommand = Command.make(
         ]);
         p.outro("✓ Done");
       });
-    }).pipe(
-      Effect.catchAll(handleCliError("Failed to create AWS object store")),
-    ),
+    }),
 ).pipe(Command.withDescription("Create a new AWS S3 object store"));