effect 4.0.0-beta.25 → 4.0.0-beta.26

package/src/unstable/cli/Command.ts

@@ -14,14 +14,15 @@ import * as Predicate from "../../Predicate.ts"
 import * as References from "../../References.ts"
 import * as Result from "../../Result.ts"
 import * as ServiceMap from "../../ServiceMap.ts"
+import * as Stdio from "../../Stdio.ts"
 import * as Terminal from "../../Terminal.ts"
 import type { NoInfer, Simplify } from "../../Types.ts"
 import type { ChildProcessSpawner } from "../process/ChildProcessSpawner.ts"
 import * as CliError from "./CliError.ts"
 import * as CliOutput from "./CliOutput.ts"
 import * as GlobalFlag from "./GlobalFlag.ts"
-import { checkForDuplicateFlags, makeCommand, toImpl, TypeId } from "./internal/command.ts"
-import { parseConfig } from "./internal/config.ts"
+import { checkForDuplicateFlags, makeCommand, makeParser, toImpl, TypeId } from "./internal/command.ts"
+import { mergeConfig, parseConfig } from "./internal/config.ts"
 import { getGlobalFlagsForCommandPath, getGlobalFlagsForCommandTree, getHelpForCommandPath } from "./internal/help.ts"
 import * as Lexer from "./internal/lexer.ts"
 import * as Parser from "./internal/parser.ts"
@@ -46,7 +47,7 @@ import * as Param from "./Param.ts"
  * import { Argument, Command, Flag } from "effect/unstable/cli"
  *
  * // Simple command with no configuration
- * const version: Command.Command<"version", {}, never, never> = Command.make(
+ * const version: Command.Command<"version", {}, {}, never, never> = Command.make(
  *   "version"
  * )
  *
@@ -58,6 +59,7 @@ import * as Param from "./Param.ts"
  *     readonly force: boolean
  *     readonly files: ReadonlyArray<string>
  *   },
+ *   {},
  *   never,
  *   never
  * > = Command.make("deploy", {
@@ -75,14 +77,15 @@ import * as Param from "./Param.ts"
  * @since 4.0.0
  * @category models
  */
-export interface Command<Name extends string, Input, E = never, R = never> extends
-  Pipeable,
-  Effect.Yieldable<
-    Command<Name, Input, E, R>,
-    Input,
-    never,
-    CommandContext<Name>
-  >
+export interface Command<Name extends string, Input, ContextInput = {}, E = never, R = never>
+  extends
+    Pipeable,
+    Effect.Yieldable<
+      Command<Name, Input, ContextInput, E, R>,
+      ContextInput,
+      never,
+      CommandContext<Name>
+    >
 {
   readonly [TypeId]: typeof TypeId
 
@@ -183,6 +186,21 @@ export declare namespace Command {
       | Config
   }
 
+  /**
+   * Configuration shape accepted by `Command.withSharedFlags`.
+   *
+   * Only flags are allowed here; arguments are intentionally excluded.
+   *
+   * @since 4.0.0
+   * @category models
+   */
+  export interface FlagConfig {
+    readonly [key: string]:
+      | Param.Param<typeof Param.flagKind, any>
+      | ReadonlyArray<Param.Param<typeof Param.flagKind, any> | FlagConfig>
+      | FlagConfig
+  }
+
   /**
    * Utilities for working with command configurations.
    *
@@ -244,7 +262,7 @@ export declare namespace Command {
    * @since 4.0.0
    * @category models
    */
-  export type Any = Command<string, unknown, unknown, unknown>
+  export type Any = Command<string, unknown, unknown, unknown, unknown>
 
   /**
    * A grouped set of subcommands used by `Command.withSubcommands`.
@@ -272,7 +290,7 @@ export declare namespace Command {
  * @since 4.0.0
  * @category utility types
  */
-export type Environment = FileSystem.FileSystem | Path.Path | Terminal.Terminal | ChildProcessSpawner
+export type Environment = FileSystem.FileSystem | Path.Path | Terminal.Terminal | ChildProcessSpawner | Stdio.Stdio
 
 /**
  * A utility type to extract the error type from a `Command`.
@@ -283,6 +301,7 @@ export type Environment = FileSystem.FileSystem | Path.Path | Terminal.Terminal
 export type Error<C> = C extends Command<
   infer _Name,
   infer _Input,
+  infer _ContextInput,
   infer _Error,
   infer _Requirements
 > ? _Error :
@@ -301,10 +320,12 @@ export type Error<C> = C extends Command<
  * import { Console, Effect } from "effect"
  * import { Command, Flag } from "effect/unstable/cli"
  *
- * const parent = Command.make("app", {
- *   verbose: Flag.boolean("verbose"),
- *   config: Flag.string("config")
- * })
+ * const parent = Command.make("app").pipe(
+ *   Command.withSharedFlags({
+ *     verbose: Flag.boolean("verbose"),
+ *     config: Flag.string("config")
+ *   })
+ * )
  *
  * const child = Command.make("deploy", {
  *   target: Flag.string("target")
@@ -466,7 +487,7 @@ export const make: {
    * @since 4.0.0
    * @category constructors
    */
-  <Name extends string>(name: Name): Command<Name, {}, never, never>
+  <Name extends string>(name: Name): Command<Name, {}, {}, never, never>
 
   /* ========================================================================== */
   /* Constructors                                                               */
@@ -525,7 +546,7 @@ export const make: {
    * @since 4.0.0
    * @category constructors
    */
-  <Name extends string, const Config extends Command.Config>(name: Name, config: Config): Command<Name, Command.Config.Infer<Config>, never, never>
+  <Name extends string, const Config extends Command.Config>(name: Name, config: Config): Command<Name, Command.Config.Infer<Config>, {}, never, never>
 
   /* ========================================================================== */
   /* Constructors                                                               */
@@ -588,7 +609,7 @@ export const make: {
     name: Name,
     config: Config,
     handler: (config: Command.Config.Infer<Config>) => Effect.Effect<void, E, R>
-  ): Command<Name, Command.Config.Infer<Config>, E, Exclude<R, GlobalFlag.BuiltInSettingContext>>
+  ): Command<Name, Command.Config.Infer<Config>, {}, E, Exclude<R, GlobalFlag.BuiltInSettingContext>>
 } = ((
   name: string,
   config?: Command.Config,
@@ -659,9 +680,9 @@ export const withHandler: {
    * @since 4.0.0
    * @category combinators
    */
-  <A, R, E>(handler: (value: A) => Effect.Effect<void, E, R>): <Name extends string, XR, XE>(
-    self: Command<Name, A, XE, XR>
-  ) => Command<Name, A, E, Exclude<R, GlobalFlag.BuiltInSettingContext>>
+  <A, R, E>(handler: (value: A) => Effect.Effect<void, E, R>): <Name extends string, XR, XE, ContextInput>(
+    self: Command<Name, A, ContextInput, XE, XR>
+  ) => Command<Name, A, ContextInput, E, Exclude<R, GlobalFlag.BuiltInSettingContext>>
   /* ========================================================================== */
   /* Combinators                                                                */
   /* ========================================================================== */
@@ -690,14 +711,14 @@ export const withHandler: {
    * @since 4.0.0
    * @category combinators
    */
-  <Name extends string, A, XR, XE, R, E>(
-    self: Command<Name, A, XE, XR>,
+  <Name extends string, A, XR, XE, R, E, ContextInput>(
+    self: Command<Name, A, ContextInput, XE, XR>,
     handler: (value: A) => Effect.Effect<void, E, R>
-  ): Command<Name, A, E, Exclude<R, GlobalFlag.BuiltInSettingContext>>
-} = dual(2, <Name extends string, A, XR, XE, R, E>(
-  self: Command<Name, A, XE, XR>,
+  ): Command<Name, A, ContextInput, E, Exclude<R, GlobalFlag.BuiltInSettingContext>>
+} = dual(2, <Name extends string, A, XR, XE, R, E, ContextInput>(
+  self: Command<Name, A, ContextInput, XE, XR>,
   handler: (value: A) => Effect.Effect<void, E, R>
-): Command<Name, A, E, Exclude<R, GlobalFlag.BuiltInSettingContext>> =>
+): Command<Name, A, ContextInput, E, Exclude<R, GlobalFlag.BuiltInSettingContext>> =>
   makeCommand({ ...toImpl(self), handle: handler }))
 
 interface SubcommandGroupInternal {
@@ -755,7 +776,7 @@ const normalizeSubcommandEntries = (
  * Adds subcommands to a command, creating a hierarchical command structure.
  *
  * Subcommands can access their parent's parsed configuration by yielding the parent
- * command within their handler. This enables patterns like global flags that affect
+ * command within their handler. This enables shared parent flags that affect
  * all subcommands.
  *
  * @example
@@ -763,10 +784,12 @@ const normalizeSubcommandEntries = (
  * import { Console, Effect } from "effect"
  * import { Command, Flag } from "effect/unstable/cli"
  *
- * // Parent command with global flags
- * const git = Command.make("git", {
- *   verbose: Flag.boolean("verbose")
- * })
+ * // Parent command with shared flags
+ * const git = Command.make("git").pipe(
+ *   Command.withSharedFlags({
+ *     verbose: Flag.boolean("verbose")
+ *   })
+ * )
  *
  * // Subcommand that accesses parent config
  * const clone = Command.make("clone", {
@@ -792,7 +815,7 @@ export const withSubcommands: {
    * Adds subcommands to a command, creating a hierarchical command structure.
    *
    * Subcommands can access their parent's parsed configuration by yielding the parent
-   * command within their handler. This enables patterns like global flags that affect
+   * command within their handler. This enables shared parent flags that affect
    * all subcommands.
    *
    * @example
@@ -800,10 +823,12 @@ export const withSubcommands: {
    * import { Console, Effect } from "effect"
    * import { Command, Flag } from "effect/unstable/cli"
    *
-   * // Parent command with global flags
-   * const git = Command.make("git", {
-   *   verbose: Flag.boolean("verbose")
-   * })
+   * // Parent command with shared flags
+   * const git = Command.make("git").pipe(
+   *   Command.withSharedFlags({
+   *     verbose: Flag.boolean("verbose")
+   *   })
+   * )
    *
    * // Subcommand that accesses parent config
    * const clone = Command.make("clone", {
@@ -824,11 +849,12 @@ export const withSubcommands: {
    * @since 4.0.0
    * @category combinators
    */
-  <const Subcommands extends ReadonlyArray<Command.SubcommandEntry>>(subcommands: Subcommands): <Name extends string, Input, E, R>(
-    self: Command<Name, Input, E, R>
+  <const Subcommands extends ReadonlyArray<Command.SubcommandEntry>>(subcommands: Subcommands): <Name extends string, Input, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>
   ) => Command<
     Name,
-    Input,
+    Simplify<Input | ContextInput>,
+    ContextInput,
     E | ExtractSubcommandErrors<Subcommands>,
     R | Exclude<ExtractSubcommandContext<Subcommands>, CommandContext<Name>>
   >
@@ -836,7 +862,7 @@ export const withSubcommands: {
    * Adds subcommands to a command, creating a hierarchical command structure.
    *
    * Subcommands can access their parent's parsed configuration by yielding the parent
-   * command within their handler. This enables patterns like global flags that affect
+   * command within their handler. This enables shared parent flags that affect
    * all subcommands.
    *
    * @example
@@ -844,10 +870,12 @@ export const withSubcommands: {
    * import { Console, Effect } from "effect"
    * import { Command, Flag } from "effect/unstable/cli"
    *
-   * // Parent command with global flags
-   * const git = Command.make("git", {
-   *   verbose: Flag.boolean("verbose")
-   * })
+   * // Parent command with shared flags
+   * const git = Command.make("git").pipe(
+   *   Command.withSharedFlags({
+   *     verbose: Flag.boolean("verbose")
+   *   })
+   * )
    *
    * // Subcommand that accesses parent config
    * const clone = Command.make("clone", {
@@ -873,10 +901,12 @@ export const withSubcommands: {
     Input,
     E,
     R,
+    ContextInput,
     const Subcommands extends ReadonlyArray<Command.SubcommandEntry>
-  >(self: Command<Name, Input, E, R>, subcommands: Subcommands): Command<
+  >(self: Command<Name, Input, ContextInput, E, R>, subcommands: Subcommands): Command<
     Name,
-    Input,
+    Simplify<Input | ContextInput>,
+    ContextInput,
     E | ExtractSubcommandErrors<Subcommands>,
     R | Exclude<ExtractSubcommandContext<Subcommands>, CommandContext<Name>>
   >
@@ -885,13 +915,15 @@ export const withSubcommands: {
   Input,
   E,
   R,
+  ContextInput,
   const Subcommands extends ReadonlyArray<Command.SubcommandEntry>
 >(
-  self: Command<Name, Input, E, R>,
+  self: Command<Name, Input, ContextInput, E, R>,
   subcommands: Subcommands
 ): Command<
   Name,
-  Input,
+  Simplify<Input | ContextInput>,
+  ContextInput,
   E | ExtractSubcommandErrors<Subcommands>,
   R | Exclude<ExtractSubcommandContext<Subcommands>, CommandContext<Name>>
 > => {
@@ -901,44 +933,46 @@ export const withSubcommands: {
   const impl = toImpl(self)
   const byName = new Map(normalized.flat.map((s) => [s.name, toImpl(s)] as const))
 
-  // Internal type for routing - not exposed in public type
-  type SubcommandInfo = { readonly name: string; readonly result: unknown }
-  type InternalInput = Input & { readonly _subcommand?: SubcommandInfo }
+  type NextInput = Simplify<Input | ContextInput>
+  const SubcommandStateSymbol = Symbol("effect/cli/SubcommandState")
+  type SubcommandState = { readonly name: string; readonly result: unknown }
+  type InternalInput = NextInput & { readonly [SubcommandStateSymbol]?: SubcommandState }
 
   const parse = Effect.fnUntraced(function*(raw: ParsedTokens) {
-    const parent = yield* impl.parse(raw)
-
     if (!raw.subcommand) {
-      return parent
+      return (yield* impl.parse(raw)) as NextInput
     }
 
     const sub = byName.get(raw.subcommand.name)
     if (!sub) {
-      return parent
+      return (yield* impl.parse(raw)) as NextInput
     }
 
+    const context = yield* impl.parseContext(raw)
     const result = yield* sub.parse(raw.subcommand.parsedInput)
-    // Attach subcommand info internally for routing
-    return Object.assign({}, parent, { _subcommand: { name: sub.name, result } }) as InternalInput
+    return Object.assign({}, context, { [SubcommandStateSymbol]: { name: sub.name, result } }) as NextInput
   })
 
-  const handle = Effect.fnUntraced(function*(input: Input, path: ReadonlyArray<string>) {
+  const handle = Effect.fnUntraced(function*(input: NextInput, path: ReadonlyArray<string>) {
     const internal = input as InternalInput
-    if (internal._subcommand) {
-      const child = byName.get(internal._subcommand.name)
+    const selectedSubcommand = internal[SubcommandStateSymbol]
+
+    if (selectedSubcommand) {
+      const child = byName.get(selectedSubcommand.name)
       if (!child) {
-        return yield* new CliError.ShowHelp({ commandPath: path })
+        return yield* new CliError.ShowHelp({ commandPath: path, errors: [] })
       }
       return yield* child
-        .handle(internal._subcommand.result, [...path, child.name])
-        .pipe(Effect.provideService(impl.service, input))
+        .handle(selectedSubcommand.result, [...path, child.name])
+        .pipe(Effect.provideService(impl.service, input as unknown as ContextInput))
     }
-    return yield* impl.handle(input, path)
+    return yield* impl.handle(input as Input, path)
   })
 
   return makeCommand({
     name: impl.name,
     config: impl.config,
+    contextConfig: impl.contextConfig,
     description: impl.description,
     shortDescription: impl.shortDescription,
     alias: impl.alias,
@@ -948,10 +982,124 @@ export const withSubcommands: {
     service: impl.service,
     subcommands: normalized.groups,
     parse,
+    parseContext: impl.parseContext,
     handle
   })
 })
 
+/**
+ * Adds flags that are inherited by subcommands.
+ *
+ * Shared flags are available to this command's handler and to descendant
+ * handlers via `yield* parentCommand`. Shared flags are accepted both before
+ * and after a selected subcommand name (npm-style).
+ *
+ * @since 4.0.0
+ * @category combinators
+ */
+export const withSharedFlags: {
+  /**
+   * Adds flags that are inherited by subcommands.
+   *
+   * Shared flags are available to this command's handler and to descendant
+   * handlers via `yield* parentCommand`. Shared flags are accepted both before
+   * and after a selected subcommand name (npm-style).
+   *
+   * @since 4.0.0
+   * @category combinators
+   */
+  <const SharedFlags extends Command.FlagConfig>(sharedFlags: SharedFlags): <Name extends string, Input, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>
+  ) => Command<
+    Name,
+    Simplify<Input & Command.Config.Infer<SharedFlags>>,
+    Simplify<ContextInput & Command.Config.Infer<SharedFlags>>,
+    E,
+    R
+  >
+  /**
+   * Adds flags that are inherited by subcommands.
+   *
+   * Shared flags are available to this command's handler and to descendant
+   * handlers via `yield* parentCommand`. Shared flags are accepted both before
+   * and after a selected subcommand name (npm-style).
+   *
+   * @since 4.0.0
+   * @category combinators
+   */
+  <Name extends string, Input, E, R, ContextInput, const SharedFlags extends Command.FlagConfig>(self: Command<Name, Input, ContextInput, E, R>, sharedFlags: SharedFlags): Command<
+    Name,
+    Simplify<Input & Command.Config.Infer<SharedFlags>>,
+    Simplify<ContextInput & Command.Config.Infer<SharedFlags>>,
+    E,
+    R
+  >
+} = dual(
+  2,
+  <Name extends string, Input, E, R, ContextInput, const SharedFlags extends Command.FlagConfig>(
+    self: Command<Name, Input, ContextInput, E, R>,
+    sharedFlags: SharedFlags
+  ): Command<
+    Name,
+    Simplify<Input & Command.Config.Infer<SharedFlags>>,
+    Simplify<ContextInput & Command.Config.Infer<SharedFlags>>,
+    E,
+    R
+  > => {
+    const impl = toImpl(self)
+    const sharedConfig = parseConfig(sharedFlags)
+    const mergedConfig = mergeConfig(impl.config, sharedConfig)
+    const mergedContextConfig = mergeConfig(impl.contextConfig, sharedConfig)
+
+    if (impl.subcommands.length > 0) {
+      const flatSubcommands = impl.subcommands.flatMap((group) => group.commands)
+      checkForDuplicateFlags(self, flatSubcommands, { contextConfig: mergedContextConfig })
+    }
+
+    type SharedInput = Command.Config.Infer<SharedFlags>
+    type NextInput = Simplify<Input & SharedInput>
+    type NextContextInput = Simplify<ContextInput & SharedInput>
+
+    const parseShared = makeParser(sharedConfig) as (
+      input: ParsedTokens
+    ) => Effect.Effect<SharedInput, CliError.CliError, Environment>
+
+    const parse = Effect.fnUntraced(function*(raw: ParsedTokens) {
+      const base = yield* impl.parse(raw)
+      const shared = yield* parseShared(raw)
+      return Object.assign({}, base, shared) as NextInput
+    })
+
+    const parseContext = Effect.fnUntraced(function*(raw: ParsedTokens) {
+      const base = yield* impl.parseContext(raw)
+      const shared = yield* parseShared(raw)
+      return Object.assign({}, base, shared) as NextContextInput
+    })
+
+    const handle = (
+      input: NextInput,
+      commandPath: ReadonlyArray<string>
+    ) => impl.handle(input as Input, commandPath)
+
+    return makeCommand({
+      name: impl.name,
+      config: mergedConfig,
+      contextConfig: mergedContextConfig,
+      description: impl.description,
+      shortDescription: impl.shortDescription,
+      alias: impl.alias,
+      annotations: impl.annotations,
+      globalFlags: impl.globalFlags,
+      examples: impl.examples,
+      service: impl.service as ServiceMap.Key<CommandContext<Name>, NextContextInput>,
+      subcommands: impl.subcommands,
+      parse,
+      parseContext,
+      handle
+    })
+  }
+)
+
 /**
  * Declares global flags for a command scope.
  *
@@ -969,9 +1117,9 @@ export const withGlobalFlags: {
    * @since 4.0.0
    * @category combinators
    */
-  <const GlobalFlags extends ReadonlyArray<GlobalFlag.GlobalFlag<any>>>(globalFlags: GlobalFlags): <Name extends string, Input, E, R>(
-    self: Command<Name, Input, E, R>
-  ) => Command<Name, Input, E, Exclude<R, ExtractGlobalFlagContext<GlobalFlags>>>
+  <const GlobalFlags extends ReadonlyArray<GlobalFlag.GlobalFlag<any>>>(globalFlags: GlobalFlags): <Name extends string, Input, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>
+  ) => Command<Name, Input, ContextInput, E, Exclude<R, ExtractGlobalFlagContext<GlobalFlags>>>
   /**
    * Declares global flags for a command scope.
    *
@@ -980,13 +1128,27 @@ export const withGlobalFlags: {
    * @since 4.0.0
    * @category combinators
    */
-  <Name extends string, Input, E, R, const GlobalFlags extends ReadonlyArray<GlobalFlag.GlobalFlag<any>>>(self: Command<Name, Input, E, R>, globalFlags: GlobalFlags): Command<Name, Input, E, Exclude<R, ExtractGlobalFlagContext<GlobalFlags>>>
+  <
+    Name extends string,
+    Input,
+    E,
+    R,
+    ContextInput,
+    const GlobalFlags extends ReadonlyArray<GlobalFlag.GlobalFlag<any>>
+  >(self: Command<Name, Input, ContextInput, E, R>, globalFlags: GlobalFlags): Command<Name, Input, ContextInput, E, Exclude<R, ExtractGlobalFlagContext<GlobalFlags>>>
 } = dual(
   2,
-  <Name extends string, Input, E, R, const GlobalFlags extends ReadonlyArray<GlobalFlag.GlobalFlag<any>>>(
-    self: Command<Name, Input, E, R>,
+  <
+    Name extends string,
+    Input,
+    E,
+    R,
+    ContextInput,
+    const GlobalFlags extends ReadonlyArray<GlobalFlag.GlobalFlag<any>>
+  >(
+    self: Command<Name, Input, ContextInput, E, R>,
     globalFlags: GlobalFlags
-  ): Command<Name, Input, E, Exclude<R, ExtractGlobalFlagContext<GlobalFlags>>> => {
+  ): Command<Name, Input, ContextInput, E, Exclude<R, ExtractGlobalFlagContext<GlobalFlags>>> => {
     const impl = toImpl(self)
     const next = Array.from(new Set([...impl.globalFlags, ...globalFlags]))
     return makeCommand({ ...impl, globalFlags: next })
@@ -998,12 +1160,12 @@ type ExtractGlobalFlagContext<T extends ReadonlyArray<GlobalFlag.GlobalFlag<any>
   ? F extends GlobalFlag.Setting<infer Id, any> ? GlobalFlag.Setting.Identifier<Id>
   : never
   : never
-type ExtractSubcommand<T> = T extends Command<any, any, any, any> ? T
+type ExtractSubcommand<T> = T extends Command<any, any, any, any, any> ? T
   : T extends Command.SubcommandGroup<infer Commands> ? Commands[number]
   : never
 type ExtractSubcommandErrors<T extends ReadonlyArray<Command.SubcommandEntry>> = Error<ExtractSubcommand<T[number]>>
 type ExtractSubcommandContext<T extends ReadonlyArray<Command.SubcommandEntry>> = ExtractSubcommand<T[number]> extends
-  Command<any, any, any, infer R> ? R : never
+  Command<any, any, any, any, infer R> ? R : never
 
 /**
  * Sets the description for a command.
@@ -1054,9 +1216,9 @@ export const withDescription: {
    * @since 4.0.0
    * @category combinators
    */
-  (description: string): <const Name extends string, Input, E, R>(
-    self: Command<Name, Input, E, R>
-  ) => Command<Name, Input, E, R>
+  (description: string): <const Name extends string, Input, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>
+  ) => Command<Name, Input, ContextInput, E, R>
   /**
    * Sets the description for a command.
    *
@@ -1081,9 +1243,9 @@ export const withDescription: {
    * @since 4.0.0
    * @category combinators
    */
-  <const Name extends string, Input, E, R>(self: Command<Name, Input, E, R>, description: string): Command<Name, Input, E, R>
-} = dual(2, <const Name extends string, Input, E, R>(
-  self: Command<Name, Input, E, R>,
+  <const Name extends string, Input, E, R, ContextInput>(self: Command<Name, Input, ContextInput, E, R>, description: string): Command<Name, Input, ContextInput, E, R>
+} = dual(2, <const Name extends string, Input, E, R, ContextInput>(
+  self: Command<Name, Input, ContextInput, E, R>,
   description: string
 ) => makeCommand({ ...toImpl(self), description }))
 
@@ -1108,9 +1270,9 @@ export const withShortDescription: {
    * @since 4.0.0
    * @category combinators
    */
-  (shortDescription: string): <const Name extends string, Input, E, R>(
-    self: Command<Name, Input, E, R>
-  ) => Command<Name, Input, E, R>
+  (shortDescription: string): <const Name extends string, Input, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>
+  ) => Command<Name, Input, ContextInput, E, R>
   /**
    * Sets a short description for a command.
    *
@@ -1121,9 +1283,9 @@ export const withShortDescription: {
    * @since 4.0.0
    * @category combinators
    */
-  <const Name extends string, Input, E, R>(self: Command<Name, Input, E, R>, shortDescription: string): Command<Name, Input, E, R>
-} = dual(2, <const Name extends string, Input, E, R>(
-  self: Command<Name, Input, E, R>,
+  <const Name extends string, Input, E, R, ContextInput>(self: Command<Name, Input, ContextInput, E, R>, shortDescription: string): Command<Name, Input, ContextInput, E, R>
+} = dual(2, <const Name extends string, Input, E, R, ContextInput>(
+  self: Command<Name, Input, ContextInput, E, R>,
   shortDescription: string
 ) => makeCommand({ ...toImpl(self), shortDescription }))
 
@@ -1146,9 +1308,9 @@ export const withAlias: {
    * @since 4.0.0
    * @category combinators
    */
-  (alias: string): <const Name extends string, Input, E, R>(
-    self: Command<Name, Input, E, R>
-  ) => Command<Name, Input, E, R>
+  (alias: string): <const Name extends string, Input, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>
+  ) => Command<Name, Input, ContextInput, E, R>
   /**
    * Sets an alias for a command.
    *
@@ -1158,9 +1320,9 @@ export const withAlias: {
    * @since 4.0.0
    * @category combinators
    */
-  <const Name extends string, Input, E, R>(self: Command<Name, Input, E, R>, alias: string): Command<Name, Input, E, R>
-} = dual(2, <const Name extends string, Input, E, R>(
-  self: Command<Name, Input, E, R>,
+  <const Name extends string, Input, E, R, ContextInput>(self: Command<Name, Input, ContextInput, E, R>, alias: string): Command<Name, Input, ContextInput, E, R>
+} = dual(2, <const Name extends string, Input, E, R, ContextInput>(
+  self: Command<Name, Input, ContextInput, E, R>,
   alias: string
 ) => makeCommand({ ...toImpl(self), alias }))
 
@@ -1177,22 +1339,22 @@ export const annotate: {
    * @since 4.0.0
    * @category combinators
    */
-  <I, S>(service: ServiceMap.Key<I, S>, value: NoInfer<S>): <Name extends string, Input, E, R>(
-    self: Command<Name, Input, E, R>
-  ) => Command<Name, Input, E, R>
+  <I, S>(service: ServiceMap.Key<I, S>, value: NoInfer<S>): <Name extends string, Input, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>
+  ) => Command<Name, Input, ContextInput, E, R>
   /**
    * Adds a custom annotation to a command.
    *
    * @since 4.0.0
    * @category combinators
    */
-  <Name extends string, Input, E, R, I, S>(
-    self: Command<Name, Input, E, R>,
+  <Name extends string, Input, E, R, ContextInput, I, S>(
+    self: Command<Name, Input, ContextInput, E, R>,
     service: ServiceMap.Key<I, S>,
     value: NoInfer<S>
-  ): Command<Name, Input, E, R>
-} = dual(3, <Name extends string, Input, E, R, I, S>(
-  self: Command<Name, Input, E, R>,
+  ): Command<Name, Input, ContextInput, E, R>
+} = dual(3, <Name extends string, Input, E, R, ContextInput, I, S>(
+  self: Command<Name, Input, ContextInput, E, R>,
   service: ServiceMap.Key<I, S>,
   value: NoInfer<S>
 ) => {
@@ -1213,18 +1375,21 @@ export const annotateMerge: {
    * @since 4.0.0
    * @category combinators
    */
-  <I>(annotations: ServiceMap.ServiceMap<I>): <Name extends string, Input, E, R>(
-    self: Command<Name, Input, E, R>
-  ) => Command<Name, Input, E, R>
+  <I>(annotations: ServiceMap.ServiceMap<I>): <Name extends string, Input, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>
+  ) => Command<Name, Input, ContextInput, E, R>
   /**
    * Merges a ServiceMap of annotations into a command.
    *
    * @since 4.0.0
    * @category combinators
    */
-  <Name extends string, Input, E, R, I>(self: Command<Name, Input, E, R>, annotations: ServiceMap.ServiceMap<I>): Command<Name, Input, E, R>
-} = dual(2, <Name extends string, Input, E, R, I>(
-  self: Command<Name, Input, E, R>,
+  <Name extends string, Input, E, R, ContextInput, I>(
+    self: Command<Name, Input, ContextInput, E, R>,
+    annotations: ServiceMap.ServiceMap<I>
+  ): Command<Name, Input, ContextInput, E, R>
+} = dual(2, <Name extends string, Input, E, R, ContextInput, I>(
+  self: Command<Name, Input, ContextInput, E, R>,
   annotations: ServiceMap.ServiceMap<I>
 ) => {
   const impl = toImpl(self)
@@ -1274,9 +1439,9 @@ export const withExamples: {
    * @since 4.0.0
    * @category combinators
    */
-  (examples: ReadonlyArray<Command.Example>): <const Name extends string, Input, E, R>(
-    self: Command<Name, Input, E, R>
-  ) => Command<Name, Input, E, R>
+  (examples: ReadonlyArray<Command.Example>): <const Name extends string, Input, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>
+  ) => Command<Name, Input, ContextInput, E, R>
   /**
    * Sets usage examples for a command.
    *
@@ -1298,9 +1463,12 @@ export const withExamples: {
    * @since 4.0.0
    * @category combinators
    */
-  <const Name extends string, Input, E, R>(self: Command<Name, Input, E, R>, examples: ReadonlyArray<Command.Example>): Command<Name, Input, E, R>
-} = dual(2, <const Name extends string, Input, E, R>(
-  self: Command<Name, Input, E, R>,
+  <const Name extends string, Input, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>,
+    examples: ReadonlyArray<Command.Example>
+  ): Command<Name, Input, ContextInput, E, R>
+} = dual(2, <const Name extends string, Input, E, R, ContextInput>(
+  self: Command<Name, Input, ContextInput, E, R>,
   examples: ReadonlyArray<Command.Example>
 ) => makeCommand({ ...toImpl(self), examples }))
 
@@ -1309,10 +1477,10 @@ export const withExamples: {
 /* ========================================================================== */
 
 // Internal helper: transforms a command's handler while preserving other properties
-const mapHandler = <Name extends string, Input, E, R, E2, R2>(
-  self: Command<Name, Input, E, R>,
+const mapHandler = <Name extends string, Input, E, R, ContextInput, E2, R2>(
+  self: Command<Name, Input, ContextInput, E, R>,
   f: (handler: Effect.Effect<void, E | CliError.CliError, R | Environment>, input: Input) => Effect.Effect<void, E2, R2>
-) => {
+): Command<Name, Input, ContextInput, E2, R2> => {
   const impl = toImpl(self)
   return makeCommand({ ...impl, handle: (input, path) => f(impl.handle(input, path), input) })
 }
@@ -1395,9 +1563,9 @@ export const provide: {
     options?: {
       readonly local?: boolean | undefined
     } | undefined
-  ): <const Name extends string, E, R>(
-    self: Command<Name, Input, E, R>
-  ) => Command<Name, Input, E | LE, Exclude<R, LA> | LR>
+  ): <const Name extends string, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>
+  ) => Command<Name, Input, ContextInput, E | LE, Exclude<R, LA> | LR>
   /**
    * Provides the handler of a command with the services produced by a layer
    * that optionally depends on the command-line input to be created.
@@ -1434,15 +1602,15 @@ export const provide: {
    * @since 4.0.0
    * @category providing services
    */
-  <const Name extends string, Input, E, R, LA, LE, LR>(
-    self: Command<Name, Input, E, R>,
+  <const Name extends string, Input, E, R, ContextInput, LA, LE, LR>(
+    self: Command<Name, Input, ContextInput, E, R>,
     layer: Layer.Layer<LA, LE, LR> | ((input: Input) => Layer.Layer<LA, LE, LR>),
     options?: {
       readonly local?: boolean | undefined
     } | undefined
-  ): Command<Name, Input, E | LE, Exclude<R, LA> | LR>
-} = dual((args) => isCommand(args[0]), <const Name extends string, Input, E, R, LA, LE, LR>(
-  self: Command<Name, Input, E, R>,
+  ): Command<Name, Input, ContextInput, E | LE, Exclude<R, LA> | LR>
+} = dual((args) => isCommand(args[0]), <const Name extends string, Input, E, R, ContextInput, LA, LE, LR>(
+  self: Command<Name, Input, ContextInput, E, R>,
   layer: Layer.Layer<LA, LE, LR> | ((input: Input) => Layer.Layer<LA, LE, LR>),
   options?: { readonly local?: boolean | undefined } | undefined
 ) =>
@@ -1466,9 +1634,9 @@ export const provideSync: {
    * @since 4.0.0
    * @category providing services
    */
-  <I, S, Input>(service: ServiceMap.Key<I, S>, implementation: S | ((input: Input) => S)): <const Name extends string, E, R>(
-    self: Command<Name, Input, E, R>
-  ) => Command<Name, Input, E, Exclude<R, I>>
+  <I, S, Input>(service: ServiceMap.Key<I, S>, implementation: S | ((input: Input) => S)): <const Name extends string, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>
+  ) => Command<Name, Input, ContextInput, E, Exclude<R, I>>
   /**
    * Provides the handler of a command with the implementation of a service that
    * optionally depends on the command-line input to be constructed.
@@ -1476,13 +1644,13 @@ export const provideSync: {
    * @since 4.0.0
    * @category providing services
    */
-  <const Name extends string, Input, E, R, I, S>(
-    self: Command<Name, Input, E, R>,
+  <const Name extends string, Input, E, R, ContextInput, I, S>(
+    self: Command<Name, Input, ContextInput, E, R>,
     service: ServiceMap.Key<I, S>,
     implementation: S | ((input: Input) => S)
-  ): Command<Name, Input, E, Exclude<R, I>>
-} = dual(3, <const Name extends string, Input, E, R, I, S>(
-  self: Command<Name, Input, E, R>,
+  ): Command<Name, Input, ContextInput, E, Exclude<R, I>>
+} = dual(3, <const Name extends string, Input, E, R, ContextInput, I, S>(
+  self: Command<Name, Input, ContextInput, E, R>,
   service: ServiceMap.Key<I, S>,
   implementation: S | ((input: Input) => S)
 ) =>
@@ -1511,9 +1679,9 @@ export const provideEffect: {
   <I, S, Input, R2, E2>(
     service: ServiceMap.Key<I, S>,
     effect: Effect.Effect<S, E2, R2> | ((input: Input) => Effect.Effect<S, E2, R2>)
-  ): <const Name extends string, E, R>(
-    self: Command<Name, Input, E, R>
-  ) => Command<Name, Input, E | E2, Exclude<R, I> | R2>
+  ): <const Name extends string, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>
+  ) => Command<Name, Input, ContextInput, E | E2, Exclude<R, I> | R2>
   /**
    * Provides the handler of a command with the service produced by an effect
    * that optionally depends on the command-line input to be created.
@@ -1521,13 +1689,13 @@ export const provideEffect: {
    * @since 4.0.0
    * @category providing services
    */
-  <const Name extends string, Input, E, R, I, S, R2, E2>(
-    self: Command<Name, Input, E, R>,
+  <const Name extends string, Input, E, R, ContextInput, I, S, R2, E2>(
+    self: Command<Name, Input, ContextInput, E, R>,
     service: ServiceMap.Key<I, S>,
     effect: Effect.Effect<S, E2, R2> | ((input: Input) => Effect.Effect<S, E2, R2>)
-  ): Command<Name, Input, E | E2, Exclude<R, I> | R2>
-} = dual(3, <const Name extends string, Input, E, R, I, S, R2, E2>(
-  self: Command<Name, Input, E, R>,
+  ): Command<Name, Input, ContextInput, E | E2, Exclude<R, I> | R2>
+} = dual(3, <const Name extends string, Input, E, R, ContextInput, I, S, R2, E2>(
+  self: Command<Name, Input, ContextInput, E, R>,
   service: ServiceMap.Key<I, S>,
   effect: Effect.Effect<S, E2, R2> | ((input: Input) => Effect.Effect<S, E2, R2>)
 ) =>
@@ -1554,9 +1722,9 @@ export const provideEffectDiscard: {
    */
   <_, Input, E2, R2>(
     effect: Effect.Effect<_, E2, R2> | ((input: Input) => Effect.Effect<_, E2, R2>)
-  ): <const Name extends string, E, R>(
-    self: Command<Name, Input, E, R>
-  ) => Command<Name, Input, E | E2, R | R2>
+  ): <const Name extends string, E, R, ContextInput>(
+    self: Command<Name, Input, ContextInput, E, R>
+  ) => Command<Name, Input, ContextInput, E | E2, R | R2>
   /**
    * Allows for execution of an effect, which optionally depends on command-line
    * input to be created, prior to executing the handler of a command.
@@ -1564,12 +1732,12 @@ export const provideEffectDiscard: {
    * @since 4.0.0
    * @category providing services
    */
-  <const Name extends string, Input, E, R, _, E2, R2>(
-    self: Command<Name, Input, E, R>,
+  <const Name extends string, Input, E, R, ContextInput, _, E2, R2>(
+    self: Command<Name, Input, ContextInput, E, R>,
     effect: Effect.Effect<_, E2, R2> | ((input: Input) => Effect.Effect<_, E2, R2>)
-  ): Command<Name, Input, E | E2, R | R2>
-} = dual(2, <const Name extends string, Input, E, R, _, E2, R2>(
-  self: Command<Name, Input, E, R>,
+  ): Command<Name, Input, ContextInput, E | E2, R | R2>
+} = dual(2, <const Name extends string, Input, E, R, ContextInput, _, E2, R2>(
+  self: Command<Name, Input, ContextInput, E, R>,
   effect: Effect.Effect<_, E2, R2> | ((input: Input) => Effect.Effect<_, E2, R2>)
 ) =>
   mapHandler(self, (handler, input) => Effect.andThen(typeof effect === "function" ? effect(input) : effect, handler)))
@@ -1617,17 +1785,16 @@ const getOutOfScopeGlobalFlagErrors = (
   return errors
 }
 
-const showHelp = <Name extends string, Input, E, R>(
-  command: Command<Name, Input, E, R>,
-  commandPath: ReadonlyArray<string>,
-  errors?: ReadonlyArray<CliError.CliError>
-): Effect.Effect<void, never, Environment> =>
+const showHelp = <Name extends string, Input, E, R, ContextInput>(
+  command: Command<Name, Input, ContextInput, E, R>,
+  error: CliError.ShowHelp
+): Effect.Effect<void, CliError.CliError, Environment> =>
   Effect.gen(function*() {
     const formatter = yield* CliOutput.Formatter
-    const helpDoc = yield* getHelpForCommandPath(command, commandPath, GlobalFlag.BuiltIns)
+    const helpDoc = yield* getHelpForCommandPath(command, error.commandPath, GlobalFlag.BuiltIns)
     yield* Console.log(formatter.formatHelpDoc(helpDoc))
-    if (errors && errors.length > 0) {
-      yield* Console.error(formatter.formatErrors(errors))
+    if (error.errors.length > 0) {
+      yield* Console.error(formatter.formatErrors(error.errors as any))
     }
   })
 
@@ -1646,7 +1813,7 @@ const showHelp = <Name extends string, Input, E, R>(
  *     yield* Console.log(`Hello, ${config.name}!`)
  *   }))
  *
- * // Automatically gets args from process.argv
+ * // Automatically gets args from the Stdio service
  * const program = Command.run(greetCommand, {
  *   version: "1.0.0"
  * })
@@ -1671,7 +1838,7 @@ export const run: {
    *     yield* Console.log(`Hello, ${config.name}!`)
    *   }))
    *
-   * // Automatically gets args from process.argv
+   * // Automatically gets args from the Stdio service
    * const program = Command.run(greetCommand, {
    *   version: "1.0.0"
    * })
@@ -1684,8 +1851,8 @@ export const run: {
     config: {
       readonly version: string
     }
-  ): <Name extends string, Input, E, R>(
-    command: Command<Name, Input, E, R>
+  ): <Name extends string, Input, E, R, ContextInput>(
+    command: Command<Name, Input, ContextInput, E, R>
   ) => Effect.Effect<void, E | CliError.CliError, R | Environment>
   /**
    * Runs a command with the provided input arguments.
@@ -1702,7 +1869,7 @@ export const run: {
    *     yield* Console.log(`Hello, ${config.name}!`)
    *   }))
    *
-   * // Automatically gets args from process.argv
+   * // Automatically gets args from the Stdio service
    * const program = Command.run(greetCommand, {
    *   version: "1.0.0"
    * })
@@ -1711,23 +1878,24 @@ export const run: {
    * @since 4.0.0
    * @category command execution
    */
-  <Name extends string, Input, E, R>(
-    command: Command<Name, Input, E, R>,
+  <Name extends string, Input, E, R, ContextInput>(
+    command: Command<Name, Input, ContextInput, E, R>,
     config: {
       readonly version: string
     }
   ): Effect.Effect<void, E | CliError.CliError, R | Environment>
-} = dual(2, <Name extends string, Input, E, R>(
-  command: Command<Name, Input, E, R>,
+} = dual(2, <Name extends string, Input, E, R, ContextInput>(
+  command: Command<Name, Input, ContextInput, E, R>,
   config: {
     readonly version: string
   }
-) => {
-  // TODO: process.argv is a Node.js global. For browser/edge runtime support,
-  // consider accepting an optional args parameter or using a platform service.
-  const input = process.argv.slice(2)
-  return runWith(command, config)(input)
-})
+) =>
+  Stdio.Stdio.use(({ args }) =>
+    Effect.flatMap(
+      args,
+      (args) => runWith(command, config)(args)
+    )
+  ))
 
 /**
  * Runs a command with explicitly provided arguments instead of using process.argv.
@@ -1768,8 +1936,8 @@ export const run: {
  * @since 4.0.0
  * @category command execution
  */
-export const runWith = <const Name extends string, Input, E, R>(
-  command: Command<Name, Input, E, R>,
+export const runWith = <const Name extends string, Input, E, R, ContextInput>(
+  command: Command<Name, Input, ContextInput, E, R>,
   config: {
     readonly version: string
   }
@@ -1800,7 +1968,7 @@ export const runWith = <const Name extends string, Input, E, R>(
       const outOfScopeErrors = getOutOfScopeGlobalFlagErrors(allFlags, activeFlags, flagMap, commandPath)
       if (outOfScopeErrors.length > 0) {
         const parseErrors = parsedArgs.errors ?? []
-        return yield* showHelp(command, commandPath, [...outOfScopeErrors, ...parseErrors])
+        return yield* new CliError.ShowHelp({ commandPath, errors: [...outOfScopeErrors, ...parseErrors] })
       }
 
       // 5. Process action flags — first present action wins, then exit
@@ -1819,11 +1987,11 @@ export const runWith = <const Name extends string, Input, E, R>(
 
       // 6. Handle parsing errors
       if (parsedArgs.errors && parsedArgs.errors.length > 0) {
-        return yield* showHelp(command, commandPath, parsedArgs.errors)
+        return yield* new CliError.ShowHelp({ commandPath, errors: parsedArgs.errors })
       }
       const parseResult = yield* Effect.result(commandImpl.parse(parsedArgs))
       if (parseResult._tag === "Failure") {
-        return yield* showHelp(command, commandPath, [parseResult.failure])
+        return yield* new CliError.ShowHelp({ commandPath, errors: [parseResult.failure] })
       }
 
       // 7. Provide setting values
@@ -1847,11 +2015,11 @@ export const runWith = <const Name extends string, Input, E, R>(
       yield* Effect.provideServices(program, services)
     },
     Effect.catchFilter(
-      ((error: any) =>
+      (error) =>
         CliError.isCliError(error) && error._tag === "ShowHelp"
           ? Result.succeed(error)
-          : Result.fail(error)) as any,
-      (error: any) => showHelp(command, error.commandPath)
+          : Result.fail(error),
+      (error) => Effect.andThen(showHelp(command, error), Effect.fail(error))
     ),
     Effect.catchFilter(
       (e) =>