airfoil 0.1.1 → 0.3.0

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

@@ -1,13 +1,13 @@
-import { WingsClusterMetadata } from "@airfoil/wings";
 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(
     "Object store name in format: tenants/{tenant}/object-stores/{object-store}",
   ),
 );
@@ -54,5 +54,5 @@ export const deleteObjectStoreCommand = Command.make(
 
       s.stop("Object store deleted successfully");
       p.outro("✓ Done");
-    }).pipe(Effect.catchAll(handleCliError("Failed to delete object store"))),
+    }).pipe(Effect.catch(handleCliError("Failed to delete object store"))),
 ).pipe(Command.withDescription("Delete an object store from the cluster"));

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

@@ -1,14 +1,14 @@
-import { WingsClusterMetadata } from "@airfoil/wings";
 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 { WingsClusterMetadata } from "@airfoil/wings";
 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 { WingsClusterMetadata } from "@airfoil/wings";
 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 { WingsClusterMetadata } from "@airfoil/wings";
 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 { WingsClusterMetadata } from "@airfoil/wings";
 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 { WingsClusterMetadata } from "@airfoil/wings";
 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 type { FieldConfig } from "@airfoil/wings";
-import { WingsClusterMetadata } from "@airfoil/wings";
 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";
@@ -26,14 +26,8 @@ const SUPPORTED_INLINE_TYPES = [
   "Float16",
   "Float32",
   "Float64",
-  "LargeUtf8",
-  "LargeBinary",
   "DateDay",
   "DateMillisecond",
-  "TimeSecond",
-  "TimeMillisecond",
-  "TimeMicrosecond",
-  "TimeNanosecond",
   "TimestampSecond",
   "TimestampMillisecond",
   "TimestampMicrosecond",
@@ -42,61 +36,63 @@ const SUPPORTED_INLINE_TYPES = [
   "DurationMillisecond",
   "DurationMicrosecond",
   "DurationNanosecond",
-  "IntervalDayTime",
-  "IntervalYearMonth",
-  "IntervalMonthDayNano",
 ] as const;
 
 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 = Flag.integer("target-file-size-bytes").pipe(
+  Flag.withDescription("Target file size for compaction (bytes)"),
+  Flag.withDefault(1024 * 1024),
 );
 
 /**
  * Parse a field string in format "name:Type" or "name:Type?" (nullable)
  */
-function parseFieldString(fieldStr: string): FieldConfig {
+function parseFieldString(fieldStr: string, index: number): FieldConfig {
   const match = fieldStr.match(/^([^:]+):([^?]+)(\?)?$/);
   if (!match) {
     throw new Error(
@@ -126,14 +122,15 @@ function parseFieldString(fieldStr: string): FieldConfig {
     name: name.trim(),
     dataType: dataType as SupportedInlineType,
     nullable,
-  } as FieldConfig;
+    id: BigInt(index + 1),
+  };
 }
 
 /**
  * Parse multiple field strings into FieldConfig array
  */
-function parseFieldsFromArgs(fields: string[]): FieldConfig[] {
-  return fields.map(parseFieldString);
+function parseFieldsFromArgs(fields: ReadonlyArray<string>): FieldConfig[] {
+  return fields.map((field, index) => parseFieldString(field, index));
 }
 
 /**
@@ -165,7 +162,13 @@ function loadFieldsFromFile(filePath: string): FieldConfig[] {
     );
   }
 
-  return parsed as FieldConfig[];
+  return (parsed as FieldConfig[]).map((field, index) => {
+    const fieldId = (field as { id?: bigint | number }).id;
+    return {
+      ...field,
+      id: typeof fieldId === "bigint" ? fieldId : BigInt(fieldId ?? index + 1),
+    };
+  });
 }
 
 export const createTopicCommand = Command.make(
@@ -179,6 +182,7 @@ export const createTopicCommand = Command.make(
     partitionKey: partitionKeyOption,
     freshnessSeconds: freshnessSecondsOption,
     ttlSeconds: ttlSecondsOption,
+    targetFileSizeBytes: targetFileSizeBytesOption,
     host: hostOption,
     port: portOption,
   },
@@ -191,6 +195,7 @@ export const createTopicCommand = Command.make(
     partitionKey,
     freshnessSeconds,
     ttlSeconds,
+    targetFileSizeBytes,
     host,
     port,
   }) =>
@@ -226,7 +231,7 @@ export const createTopicCommand = Command.make(
       }
 
       const partitionKeyName = Option.getOrUndefined(partitionKey);
-      let partitionKeyIndex: number | undefined;
+      let partitionKeyId: bigint | undefined;
       if (partitionKeyName) {
         const index = topicFields.findIndex(
           (field) => field.name === partitionKeyName,
@@ -238,7 +243,15 @@ export const createTopicCommand = Command.make(
             ),
           );
         }
-        partitionKeyIndex = index;
+        const partitionField = topicFields[index];
+        if (!partitionField) {
+          return yield* Effect.fail(
+            new Error(
+              `Partition key field "${partitionKeyName}" not found in fields. Available fields: ${topicFields.map((field) => field.name).join(", ")}`,
+            ),
+          );
+        }
+        partitionKeyId = partitionField.id;
       }
 
       const layer = makeClusterMetadataLayer(host, port);
@@ -251,12 +264,13 @@ export const createTopicCommand = Command.make(
         topicId,
         description: Option.getOrUndefined(description),
         fields: topicFields,
-        partitionKey: partitionKeyIndex,
+        partitionKey: partitionKeyId,
         compaction: {
           freshnessSeconds: BigInt(freshnessSeconds),
           ttlSeconds: Option.getOrUndefined(
             Option.map(ttlSeconds, (ttl) => BigInt(ttl)),
           ),
+          targetFileSizeBytes: BigInt(targetFileSizeBytes),
         },
       }).pipe(
         Effect.provide(layer),
@@ -274,33 +288,30 @@ export const createTopicCommand = Command.make(
             description: topic.description || "-",
             partition_key:
               topic.partitionKey !== undefined
-                ? topicFields[topic.partitionKey]?.name ||
-                  topic.partitionKey.toString()
+                ? topicFields.find((field) => field.id === topic.partitionKey)
+                    ?.name || topic.partitionKey.toString()
                 : "-",
             freshness_seconds: topic.compaction.freshnessSeconds.toString(),
             ttl_seconds: topic.compaction.ttlSeconds?.toString() || "-",
-            fields_count: topic.fields.length.toString(),
+            target_file_size_bytes:
+              topic.compaction.targetFileSizeBytes.toString(),
+            fields_count: topic.schema.fields.length.toString(),
           },
         ]);
 
-        if (topic.fields.length > 0) {
+        if (topic.schema.fields.length > 0) {
           console.log("\nFields:");
           printTable(
-            topic.fields.map(
-              (
-                field: { name: string; dataType: string; nullable: boolean },
-                index: number,
-              ) => ({
-                index: index.toString(),
-                name: field.name,
-                type: field.dataType,
-                nullable: field.nullable ? "yes" : "no",
-              }),
-            ),
+            topic.schema.fields.map((field, index) => ({
+              index: index.toString(),
+              name: field.name,
+              type: field.arrowType?._tag ?? "unknown",
+              nullable: field.nullable ? "yes" : "no",
+            })),
           );
         }
 
         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 { WingsClusterMetadata } from "@airfoil/wings";
 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 { WingsClusterMetadata } from "@airfoil/wings";
 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 { WingsClusterMetadata } from "@airfoil/wings";
 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}",
   ),
 );
@@ -52,17 +52,11 @@ export const listTopicsCommand = Command.make(
           p.log.warn("No topics found");
         } else {
           printTable(
-            response.topics.map(
-              (topic: {
-                name: string;
-                description?: string | null;
-                partitionKey?: number | null;
-              }) => ({
-                name: topic.name,
-                description: topic.description || "-",
-                partition_key: topic.partitionKey?.toString() || "-",
-              }),
-            ),
+            response.topics.map((topic) => ({
+              name: topic.name,
+              description: topic.description || "-",
+              partition_key: topic.partitionKey?.toString() || "-",
+            })),
           );
         }
 
@@ -72,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)",
@@ -221,8 +221,8 @@ async function runWithDocker(options: { tag: string; forcePull: boolean }) {
       "7780:7780",
       image,
       "dev",
-      "--http-address=0.0.0.0:7780",
-      "--metadata-address=0.0.0.0:7777",
+      "--http.address=0.0.0.0:7780",
+      "--metadata.address=0.0.0.0:7777",
     ],
     {
       stdout: "inherit",