fix(cli-forge): ensure handler return types flow through sdk typings properly

Author: AgentEnder

packages/cli-forge/src/lib/internal-cli.ts

@@ -171,15 +171,19 @@ export class InternalCLI<
     return this;
   }
 
-  command<TCommandArgs extends TArgs, TCmdName extends string>(
-    cmd: Command<TArgs, TCommandArgs, TCmdName>
+  command<
+    TCommandArgs extends TArgs,
+    TCmdName extends string,
+    TChildHandlerReturn = void
+  >(
+    cmd: Command<TArgs, TCommandArgs, TCmdName, TChildHandlerReturn>
   ): CLI<
     TArgs,
     THandlerReturn,
     TChildren & {
       [key in TCmdName]: CLI<
         TCommandArgs,
-        void,
+        TChildHandlerReturn,
         {},
         CLI<TArgs, THandlerReturn, TChildren, TParent>
       >;

packages/cli-forge/src/lib/public-api.ts

@@ -89,15 +89,19 @@ export interface CLI<
   TChildren = {},
   TParent = undefined
 > {
-  command<TCommandArgs extends TArgs, TCmdName extends string>(
-    cmd: Command<TArgs, TCommandArgs, TCmdName>
+  command<
+    TCommandArgs extends TArgs,
+    TCmdName extends string,
+    TChildHandlerReturn = void
+  >(
+    cmd: Command<TArgs, TCommandArgs, TCmdName, TChildHandlerReturn>
   ): CLI<
     TArgs,
     THandlerReturn,
     TChildren & {
       [key in TCmdName]: CLI<
         TCommandArgs,
-        void,
+        TChildHandlerReturn,
         {},
         CLI<TArgs, THandlerReturn, TChildren, TParent>
       >;
@@ -918,12 +922,13 @@ export interface CLICommandOptions<
 export type Command<
   TInitial extends ParsedArgs = any,
   TArgs extends TInitial = TInitial,
-  TCommandName extends string = string
+  TCommandName extends string = string,
+  THandlerReturn = void
 > =
   | ({
       name: TCommandName;
-    } & CLICommandOptions<TInitial, TArgs>)
-  | CLI<TArgs>;
+    } & CLICommandOptions<TInitial, TArgs, THandlerReturn>)
+  | CLI<TArgs, THandlerReturn>;
 
 /**
  * Error Handler for CLI applications. Error handlers should re-throw the error if they cannot handle it.

type-tests/fixtures/composable-commands.ts

@@ -84,15 +84,15 @@ cli('db-cli')
     builder: (c) => withPromotionOpts(c),
     handler: async (opts, ctx) => {
       const { seed, migrate, reset } = ctx.command.getParent().getChildren();
-      reset.getHandler()?.({
+      await reset.getHandler()?.({
         local: opts.local,
       });
-      migrate.getHandler()?.({
+      await migrate.getHandler()?.({
         local: opts.local,
         //@ts-expect-error -- this field shouldn't be supported by TS, if it is that signals bad type inference
         type: 'foo',
       });
-      seed.getHandler()?.({
+      await seed.getHandler()?.({
         local: opts.local,
         type: 'scrape',
         promotion: opts.promotion,