fix nested workflows

Author: ianmacartney

example/convex/_generated/api.d.ts

@@ -10,6 +10,7 @@
 
 import type * as admin from "../admin.js";
 import type * as example from "../example.js";
+import type * as nestedWorkflow from "../nestedWorkflow.js";
 import type * as transcription from "../transcription.js";
 import type * as userConfirmation_steps from "../userConfirmation/steps.js";
 import type * as userConfirmation_workflow from "../userConfirmation/workflow.js";
@@ -31,6 +32,7 @@ import type {
 declare const fullApi: ApiFromModules<{
   admin: typeof admin;
   example: typeof example;
+  nestedWorkflow: typeof nestedWorkflow;
   transcription: typeof transcription;
   "userConfirmation/steps": typeof userConfirmation_steps;
   "userConfirmation/workflow": typeof userConfirmation_workflow;

example/convex/nestedWorkflow.ts

@@ -0,0 +1,25 @@
+import { v } from "convex/values";
+import { workflow } from "./example";
+import { internal } from "./_generated/api";
+
+export const parentWorkflow = workflow.define({
+  args: { prompt: v.string() },
+  returns: v.null(),
+  handler: async (ctx, args) => {
+    console.log("Starting confirmation workflow");
+    const length = await ctx.runWorkflow(
+      internal.nestedWorkflow.nestedWorkflow,
+      { foo: args.prompt },
+    );
+    console.log("Length:", length);
+  },
+});
+
+export const nestedWorkflow = workflow.define({
+  args: { foo: v.string() },
+  returns: v.number(),
+  handler: async (_, args) => {
+    console.log("Starting nested workflow");
+    return args.foo.length;
+  },
+});

src/client/index.ts

@@ -15,7 +15,12 @@ import {
   type RegisteredMutation,
   type ReturnValueForOptionalValidator,
 } from "convex/server";
-import type { ObjectType, PropertyValidators, Validator } from "convex/values";
+import type {
+  Infer,
+  ObjectType,
+  PropertyValidators,
+  Validator,
+} from "convex/values";
 import type { Step } from "../component/schema.js";
 import type {
   EventId,
@@ -113,7 +118,9 @@ export class WorkflowManager {
       fn: "You should not call this directly, call workflow.start instead";
       args: ObjectType<ArgsValidator>;
     },
-    void
+    ReturnsValidator extends Validator<unknown, "required", string>
+      ? Infer<ReturnsValidator>
+      : void
   > {
     return workflowMutation(
       this.component,

src/client/types.ts

@@ -91,7 +91,7 @@ export type WorkflowCtx = {
    */
   runWorkflow<Workflow extends FunctionReference<"mutation", "internal">>(
     workflow: Workflow,
-    args: FunctionArgs<Workflow>,
+    args: FunctionArgs<Workflow>["args"],
     opts?: RunOptions,
   ): Promise<FunctionReturnType<Workflow>>;