airfoil 0.2.0 → 0.3.0

package/src/commands/cluster/object-store/get.ts

@@ -1,14 +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(
+const nameOption = Flag.string("name").pipe(
+  Flag.withDescription(
     "Object store name in format: tenants/{tenant}/object-stores/{object-store}",
   ),
 );
@@ -47,5 +47,5 @@ export const getObjectStoreCommand = Command.make(
         ]);
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to get object store"))),
+    }).pipe(Effect.catch(handleCliError("Failed to get object store"))),
 ).pipe(Command.withDescription("Get details of a specific object store"));

package/src/commands/cluster/object-store/list.ts

@@ -1,8 +1,8 @@
 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 {
@@ -12,8 +12,8 @@ import {
   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 listObjectStoresCommand = Command.make(
@@ -68,5 +68,5 @@ export const listObjectStoresCommand = Command.make(
 
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to list object stores"))),
+    }).pipe(Effect.catch(handleCliError("Failed to list object stores"))),
 ).pipe(Command.withDescription("List all object stores belonging to a tenant"));

package/src/commands/cluster/tenant/create.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 tenantIdOption = Options.text("tenant-id").pipe(
-  Options.withDescription(
-    "Unique identifier for the tenant (e.g., 'acme-corp')",
-  ),
+const tenantIdOption = Flag.string("tenant-id").pipe(
+  Flag.withDescription("Unique identifier for the tenant (e.g., 'acme-corp')"),
 );
 
 export const createTenantCommand = Command.make(
@@ -44,5 +42,5 @@ export const createTenantCommand = Command.make(
         printTable([{ name: tenant.name }]);
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to create tenant"))),
+    }).pipe(Effect.catch(handleCliError("Failed to create tenant"))),
 ).pipe(Command.withDescription("Create a new tenant in the cluster"));

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

@@ -1,13 +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(
+const nameOption = Flag.string("name").pipe(
+  Flag.withDescription(
     "Tenant name in format: tenants/{tenant} (e.g., 'tenants/acme-corp')",
   ),
 );
@@ -54,7 +54,7 @@ export const deleteTenantCommand = Command.make(
 
       s.stop("Tenant deleted successfully");
       p.outro("✓ Done");
-    }).pipe(Effect.catchAll(handleCliError("Failed to delete tenant"))),
+    }).pipe(Effect.catch(handleCliError("Failed to delete tenant"))),
 ).pipe(
   Command.withDescription(
     "Delete a tenant from the cluster (fails if tenant has any namespaces)",

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

@@ -1,14 +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(
+const nameOption = Flag.string("name").pipe(
+  Flag.withDescription(
     "Tenant name in format: tenants/{tenant} (e.g., 'tenants/acme-corp')",
   ),
 );
@@ -40,5 +40,5 @@ export const getTenantCommand = Command.make(
         printTable([{ name: tenant.name }]);
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to get tenant"))),
+    }).pipe(Effect.catch(handleCliError("Failed to get tenant"))),
 ).pipe(Command.withDescription("Get details of a specific tenant"));

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

@@ -1,8 +1,8 @@
 import * as p from "@clack/prompts";
-import { Command } from "@effect/cli";
 import { WingsClusterMetadata } from "@useairfoil/wings";
 import { printTable } from "console-table-printer";
 import { Effect, Option } from "effect";
+import { Command } from "effect/unstable/cli";
 import { makeClusterMetadataLayer } from "../../../utils/client.js";
 import { handleCliError } from "../../../utils/effect.js";
 import {
@@ -56,5 +56,5 @@ export const listTenantsCommand = Command.make(
 
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to list tenants"))),
+    }).pipe(Effect.catch(handleCliError("Failed to list tenants"))),
 ).pipe(Command.withDescription("List all tenants in the cluster"));

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

@@ -1,10 +1,10 @@
 import * as fs from "node:fs";
 import * as p from "@clack/prompts";
-import { Command, Options } from "@effect/cli";
 import type { FieldConfig } from "@useairfoil/wings";
 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";
@@ -40,55 +40,53 @@ const SUPPORTED_INLINE_TYPES = [
 
 type SupportedInlineType = (typeof SUPPORTED_INLINE_TYPES)[number];
 
-const parentOption = Options.text("parent").pipe(
-  Options.withDescription(
+const parentOption = Flag.string("parent").pipe(
+  Flag.withDescription(
     "Parent namespace in format: tenants/{tenant}/namespaces/{namespace}",
   ),
 );
 
-const topicIdOption = Options.text("topic-id").pipe(
-  Options.withDescription("Unique identifier for the topic"),
+const topicIdOption = Flag.string("topic-id").pipe(
+  Flag.withDescription("Unique identifier for the topic"),
 );
 
-const descriptionOption = Options.text("description").pipe(
-  Options.withDescription("Topic description"),
-  Options.optional,
+const descriptionOption = Flag.string("description").pipe(
+  Flag.withDescription("Topic description"),
+  Flag.optional,
 );
 
-const fieldsOption = Options.text("fields").pipe(
-  Options.withDescription(
+const fieldsOption = Flag.string("fields").pipe(
+  Flag.withDescription(
     'Field definitions in format "name:Type" or "name:Type?" for nullable',
   ),
-  Options.repeated,
+  Flag.atLeast(0),
 );
 
-const schemaFileOption = Options.text("schema-file").pipe(
-  Options.withDescription(
+const schemaFileOption = Flag.string("schema-file").pipe(
+  Flag.withDescription(
     "Path to JSON file containing FieldConfig[] (for complex types)",
   ),
-  Options.optional,
+  Flag.optional,
 );
 
-const partitionKeyOption = Options.text("partition-key").pipe(
-  Options.withDescription("Name of the field used for partitioning"),
-  Options.optional,
+const partitionKeyOption = Flag.string("partition-key").pipe(
+  Flag.withDescription("Name of the field used for partitioning"),
+  Flag.optional,
 );
 
-const freshnessSecondsOption = Options.integer("freshness-seconds").pipe(
-  Options.withDescription("How often to compact the topic (seconds)"),
-  Options.withDefault(60),
+const freshnessSecondsOption = Flag.integer("freshness-seconds").pipe(
+  Flag.withDescription("How often to compact the topic (seconds)"),
+  Flag.withDefault(60),
 );
 
-const ttlSecondsOption = Options.integer("ttl-seconds").pipe(
-  Options.withDescription("How long to keep topic data (seconds)"),
-  Options.optional,
+const ttlSecondsOption = Flag.integer("ttl-seconds").pipe(
+  Flag.withDescription("How long to keep topic data (seconds)"),
+  Flag.optional,
 );
 
-const targetFileSizeBytesOption = Options.integer(
-  "target-file-size-bytes",
-).pipe(
-  Options.withDescription("Target file size for compaction (bytes)"),
-  Options.withDefault(1024 * 1024),
+const targetFileSizeBytesOption = Flag.integer("target-file-size-bytes").pipe(
+  Flag.withDescription("Target file size for compaction (bytes)"),
+  Flag.withDefault(1024 * 1024),
 );
 
 /**
@@ -131,7 +129,7 @@ function parseFieldString(fieldStr: string, index: number): FieldConfig {
 /**
  * Parse multiple field strings into FieldConfig array
  */
-function parseFieldsFromArgs(fields: string[]): FieldConfig[] {
+function parseFieldsFromArgs(fields: ReadonlyArray<string>): FieldConfig[] {
   return fields.map((field, index) => parseFieldString(field, index));
 }
 
@@ -315,5 +313,5 @@ export const createTopicCommand = Command.make(
 
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to create topic"))),
+    }).pipe(Effect.catch(handleCliError("Failed to create topic"))),
 ).pipe(Command.withDescription("Create a new topic belonging to a namespace"));

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

@@ -1,20 +1,20 @@
 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(
+const nameOption = Flag.string("name").pipe(
+  Flag.withDescription(
     "Topic name in format: tenants/{tenant}/namespaces/{namespace}/topics/{topic}",
   ),
 );
 
-const forceDeleteOption = Options.boolean("force-delete").pipe(
-  Options.withDescription("Also delete data associated with the topic"),
-  Options.withDefault(false),
+const forceDeleteOption = Flag.boolean("force-delete").pipe(
+  Flag.withDescription("Also delete data associated with the topic"),
+  Flag.withDefault(false),
 );
 
 export const deleteTopicCommand = Command.make(
@@ -63,5 +63,5 @@ export const deleteTopicCommand = Command.make(
 
       s.stop("Topic deleted successfully");
       p.outro("✓ Done");
-    }).pipe(Effect.catchAll(handleCliError("Failed to delete topic"))),
+    }).pipe(Effect.catch(handleCliError("Failed to delete topic"))),
 ).pipe(Command.withDescription("Delete a topic from the cluster"));

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

@@ -1,14 +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(
+const nameOption = Flag.string("name").pipe(
+  Flag.withDescription(
     "Topic name in format: tenants/{tenant}/namespaces/{namespace}/topics/{topic}",
   ),
 );
@@ -47,5 +47,5 @@ export const getTopicCommand = Command.make(
 
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to get topic"))),
+    }).pipe(Effect.catch(handleCliError("Failed to get topic"))),
 ).pipe(Command.withDescription("Get details of a specific topic"));

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

@@ -1,8 +1,8 @@
 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 {
@@ -12,8 +12,8 @@ import {
   portOption,
 } from "../../../utils/options.js";
 
-const parentOption = Options.text("parent").pipe(
-  Options.withDescription(
+const parentOption = Flag.string("parent").pipe(
+  Flag.withDescription(
     "Parent namespace in format: tenants/{tenant}/namespaces/{namespace}",
   ),
 );
@@ -66,5 +66,5 @@ export const listTopicsCommand = Command.make(
 
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Failed to list topics"))),
+    }).pipe(Effect.catch(handleCliError("Failed to list topics"))),
 ).pipe(Command.withDescription("List all topics belonging to a namespace"));

package/src/commands/dev.ts

@@ -1,40 +1,40 @@
 import * as p from "@clack/prompts";
-import { Command, Options } from "@effect/cli";
 import { Effect } from "effect";
+import { Command, Flag } from "effect/unstable/cli";
 import { handleCliError } from "../utils/effect.js";
 import { downloadWings, getWingsPath, verifyChecksum } from "../utils/wings.js";
 
-const dockerOption = Options.boolean("docker").pipe(
-  Options.withDescription("Run Wings using Docker (recommended)"),
-  Options.withDefault(false),
+const dockerOption = Flag.boolean("docker").pipe(
+  Flag.withDescription("Run Wings using Docker (recommended)"),
+  Flag.withDefault(false),
 );
 
-const versionOption = Options.text("version").pipe(
-  Options.withDescription(
+const versionOption = Flag.string("version").pipe(
+  Flag.withDescription(
     "Specify Wings version (e.g., v0.1.0-alpha.11 or 'latest')",
   ),
-  Options.withDefault("latest"),
+  Flag.withDefault("latest"),
 );
 
-const tagOption = Options.text("tag").pipe(
-  Options.withDescription("Docker image tag (only with --docker)"),
-  Options.withDefault("latest"),
+const tagOption = Flag.string("tag").pipe(
+  Flag.withDescription("Docker image tag (only with --docker)"),
+  Flag.withDefault("latest"),
 );
 
-const forcePullOption = Options.boolean("force-pull").pipe(
-  Options.withDescription("Force pull Docker image even if it exists locally"),
-  Options.withDefault(false),
+const forcePullOption = Flag.boolean("force-pull").pipe(
+  Flag.withDescription("Force pull Docker image even if it exists locally"),
+  Flag.withDefault(false),
 );
 
-const stressOption = Options.boolean("stress").pipe(
-  Options.withDescription("Use Wings stress binary variant"),
-  Options.withDefault(false),
+const stressOption = Flag.boolean("stress").pipe(
+  Flag.withDescription("Use Wings stress binary variant"),
+  Flag.withDefault(false),
 );
 
-const yesOption = Options.boolean("yes").pipe(
-  Options.withAlias("y"),
-  Options.withDescription("Skip confirmation prompts"),
-  Options.withDefault(false),
+const yesOption = Flag.boolean("yes").pipe(
+  Flag.withAlias("y"),
+  Flag.withDescription("Skip confirmation prompts"),
+  Flag.withDefault(false),
 );
 
 export const devCommand = Command.make(
@@ -53,7 +53,7 @@ export const devCommand = Command.make(
         options.docker ? runWithDocker(options) : runWithBinary(options),
       catch: (error) =>
         error instanceof Error ? error : new Error("Operation failed"),
-    }).pipe(Effect.catchAll(handleCliError("Operation failed"))),
+    }).pipe(Effect.catch(handleCliError("Operation failed"))),
 ).pipe(
   Command.withDescription(
     "Download and run Wings dev server locally (Docker recommended for portability)",

package/src/commands/sql.ts

@@ -1,33 +1,33 @@
 import { readFileSync } from "node:fs";
 import * as p from "@clack/prompts";
-import { Args, Command, Options } from "@effect/cli";
 import { ArrowFlightSqlClient } from "@useairfoil/flight";
 import { printTable } from "console-table-printer";
 import { Effect, Option } from "effect";
+import { Argument, Command, Flag } from "effect/unstable/cli";
 import { Metadata } from "nice-grpc-common";
 import { handleCliError } from "../utils/effect.js";
 import { hostOption, portOption } from "../utils/options.js";
 
-const queryArg = Args.text({ name: "query" }).pipe(
-  Args.withDescription("SQL query to execute"),
-  Args.optional,
+const queryArg = Argument.string("query").pipe(
+  Argument.withDescription("SQL query to execute"),
+  Argument.optional,
 );
 
-const fileOption = Options.text("file").pipe(
-  Options.withAlias("f"),
-  Options.withDescription("Execute SQL from file"),
-  Options.optional,
+const fileOption = Flag.string("file").pipe(
+  Flag.withAlias("f"),
+  Flag.withDescription("Execute SQL from file"),
+  Flag.optional,
 );
 
-const namespaceOption = Options.text("namespace").pipe(
-  Options.withAlias("n"),
-  Options.withDescription("Wings namespace"),
-  Options.withDefault("tenants/default/namespaces/default"),
+const namespaceOption = Flag.string("namespace").pipe(
+  Flag.withAlias("n"),
+  Flag.withDescription("Wings namespace"),
+  Flag.withDefault("tenants/default/namespaces/default"),
 );
 
-const jsonOption = Options.boolean("json").pipe(
-  Options.withDescription("Output results as JSON"),
-  Options.withDefault(false),
+const jsonOption = Flag.boolean("json").pipe(
+  Flag.withDescription("Output results as JSON"),
+  Flag.withDefault(false),
 );
 
 export const sqlCommand = Command.make(
@@ -117,5 +117,5 @@ export const sqlCommand = Command.make(
         }
         p.outro("✓ Done");
       });
-    }).pipe(Effect.catchAll(handleCliError("Command failed"))),
+    }).pipe(Effect.catch(handleCliError("Command failed"))),
 ).pipe(Command.withDescription("Execute SQL queries using Arrow Flight SQL"));

package/src/index.ts

@@ -1,18 +1,20 @@
 #!/usr/bin/env bun
-import { Command } from "@effect/cli";
-import { NodeContext, NodeRuntime } from "@effect/platform-node";
+import { NodeRuntime, NodeServices } from "@effect/platform-node";
 import { Effect } from "effect";
+import { Command } from "effect/unstable/cli";
+import packageJson from "../package.json";
 import { clusterCommand } from "./commands/cluster/index.js";
 import { devCommand } from "./commands/dev.js";
 import { sqlCommand } from "./commands/sql.js";
 
+const version = packageJson.version;
+
 const program = Command.make("airfoil", {}, () => Effect.void).pipe(
   Command.withSubcommands([devCommand, sqlCommand, clusterCommand]),
 );
 
 const cli = Command.run(program, {
-  name: "Airfoil CLI - Manage your Wings deployments",
-  version: "0.1.0",
+  version,
 });
 
-cli(process.argv).pipe(Effect.provide(NodeContext.layer), NodeRuntime.runMain);
+cli.pipe(Effect.provide(NodeServices.layer), NodeRuntime.runMain);

package/src/utils/options.ts

@@ -1,36 +1,37 @@
-import { Options } from "@effect/cli";
+import { Flag } from "effect/unstable/cli";
 
 /**
  * Common server connection options
  */
-export const hostOption = Options.text("host").pipe(
-  Options.withDescription("Server host"),
-  Options.withDefault("localhost"),
+export const hostOption = Flag.string("host").pipe(
+  Flag.withDescription("Server host"),
+  Flag.withDefault("localhost"),
 );
 
-export const portOption = Options.integer("port").pipe(
-  Options.withDescription("Server port"),
-  Options.withAlias("p"),
-  Options.withDefault(7777),
+export const portOption = Flag.integer("port").pipe(
+  Flag.withDescription("Server port"),
+  Flag.withAlias("p"),
+  Flag.withDefault(7777),
 );
 
 /**
  * Common pagination options
  */
-export const pageSizeOption = Options.integer("page-size").pipe(
-  Options.withDescription("Number of items to return (max: 1000)"),
-  Options.withDefault(100),
+export const pageSizeOption = Flag.integer("page-size").pipe(
+  Flag.withDescription("Number of items to return (max: 1000)"),
+  Flag.withDefault(100),
 );
 
-export const pageTokenOption = Options.text("page-token").pipe(
-  Options.withDescription("Continuation token for pagination"),
-  Options.optional,
+export const pageTokenOption = Flag.optional(
+  Flag.string("page-token").pipe(
+    Flag.withDescription("Continuation token for pagination"),
+  ),
 );
 
 /**
  * Force flag for destructive operations
  */
-export const forceOption = Options.boolean("force").pipe(
-  Options.withDescription("Skip confirmation prompt"),
-  Options.withDefault(false),
+export const forceOption = Flag.boolean("force").pipe(
+  Flag.withDescription("Skip confirmation prompt"),
+  Flag.withDefault(false),
 );