Use @inngest/ai and optional step tooling

package.json

@@ -46,10 +46,11 @@
   },
   "dependencies": {
     "@dmitryrechkin/json-schema-to-zod": "^1.0.0",
+    "@inngest/ai": "^0.0.0",
     "@modelcontextprotocol/sdk": "^1.1.1",
     "eventsource": "^3.0.2",
     "express": "^4.21.1",
-    "inngest": "^3.29.0",
+    "inngest": "^3.30.0",
     "openai-zod-to-json-schema": "^1.0.3",
     "zod": "^3.23.8"
   },

src/adapters/anthropic.ts

@@ -7,7 +7,7 @@ import {
   type AiAdapter,
   type Anthropic,
   type AnthropicAiAdapter,
-} from "inngest";
+} from "@inngest/ai";
 import { zodToJsonSchema } from "openai-zod-to-json-schema";
 import { z } from "zod";
 import { type AgenticModel } from "../model";

src/adapters/index.ts

@@ -1,4 +1,4 @@
-import { type AiAdapter, type AiAdapters } from "inngest";
+import { type AiAdapter, type AiAdapters } from "@inngest/ai";
 import { type AgenticModel } from "../model";
 import * as anthropic from "./anthropic";
 import * as openai from "./openai";

src/adapters/openai.ts

@@ -4,7 +4,7 @@
  * @module
  */
 
-import { type AiAdapter, type OpenAi } from "inngest";
+import { type AiAdapter, type OpenAi } from "@inngest/ai";
 import { zodToJsonSchema } from "openai-zod-to-json-schema";
 import { type AgenticModel } from "../model";
 import {

src/agent.ts

@@ -1,5 +1,15 @@
-import { type AiAdapter } from "inngest";
+import {
+  JSONSchemaToZod,
+  type JSONSchema,
+} from "@dmitryrechkin/json-schema-to-zod";
+import { type AiAdapter } from "@inngest/ai";
+import { Client as MCPClient } from "@modelcontextprotocol/sdk/client/index.js";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { WebSocketClientTransport } from "@modelcontextprotocol/sdk/client/websocket.js";
 import { type Transport } from "@modelcontextprotocol/sdk/shared/transport";
+import { ListToolsResultSchema } from "@modelcontextprotocol/sdk/types.js";
+import { EventSource } from "eventsource";
+import type { ZodType } from "zod";
 import { createAgenticModelFromAiAdapter, type AgenticModel } from "./model";
 import { NetworkRun } from "./networkRun";
 import {
@@ -8,20 +18,8 @@ import {
   type Message,
   type ToolResultMessage,
 } from "./state";
-import { type Tool, type MCP } from "./types";
+import { type MCP, type Tool } from "./types";
 import { getStepTools, type AnyZodType, type MaybePromise } from "./util";
-// MCP
-import { Client as MCPClient } from "@modelcontextprotocol/sdk/client/index.js";
-import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
-import { WebSocketClientTransport } from "@modelcontextprotocol/sdk/client/websocket.js";
-import { ListToolsResultSchema } from "@modelcontextprotocol/sdk/types.js";
-import {
-  type JSONSchema,
-  JSONSchemaToZod,
-} from "@dmitryrechkin/json-schema-to-zod";
-import type { ZodType } from "zod";
-import { EventSource } from "eventsource";
-
 /**
  * createTool is a helper that properly types the input argument for a handler
  * based off of the Zod parameter types.
@@ -284,7 +282,7 @@ export class Agent {
         const result = await found.handler(tool.input, {
           agent: this,
           network,
-          step: await getStepTools(),
+          // step: await getStepTools(),
         });
 
         // TODO: handle error and send them back to the LLM
@@ -392,16 +390,16 @@ export class Agent {
             server,
             tool: t,
           },
-          handler: async (
-            input: { [x: string]: unknown } | undefined,
-            opts
-          ) => {
-            const result = await opts.step.run(name, async () => {
-              return await client.callTool({
+          handler: async (input: { [x: string]: unknown } | undefined) => {
+            const fn = () =>
+              client.callTool({
                 name: t.name,
                 arguments: input,
               });
-            });
+
+            const step = await getStepTools();
+            const result = await (step?.run(name, fn) ?? fn());
+
             return result.content;
           },
         });

src/model.ts

@@ -1,4 +1,4 @@
-import { type AiAdapter } from "inngest";
+import { type AiAdapter } from "@inngest/ai";
 import { adapters } from "./adapters";
 import { type Message } from "./state";
 import { type Tool } from "./types";
@@ -41,12 +41,48 @@ export class AgenticModel<TAiAdapter extends AiAdapter.Any> {
     tools: Tool.Any[],
     tool_choice: Tool.Choice
   ): Promise<AgenticModel.InferenceResponse> {
+    const body = this.requestParser(this.#model, input, tools, tool_choice);
+    let result: AiAdapter.Input<TAiAdapter>;
+
     const step = await getStepTools();
 
-    const result = (await step.ai.infer(stepID, {
-      model: this.#model,
-      body: this.requestParser(this.#model, input, tools, tool_choice),
-    })) as AiAdapter.Input<TAiAdapter>;
+    if (step) {
+      result = (await step.ai.infer(stepID, {
+        model: this.#model,
+        body,
+      })) as AiAdapter.Input<TAiAdapter>;
+    } else {
+      // Allow the model to mutate options and body for this call
+      const modelCopy = { ...this.#model };
+      this.#model.onCall?.(modelCopy, body);
+
+      const url = new URL(modelCopy.url || "");
+
+      const headers: Record<string, string> = {
+        "Content-Type": "application/json",
+      };
+
+      // Make sure we handle every known format in `@inngest/ai`.
+      const formatHandlers: Record<AiAdapter.Format, () => void> = {
+        "openai-chat": () => {
+          headers["Authorization"] = `Bearer ${modelCopy.authKey}`;
+        },
+        anthropic: () => {
+          headers["x-api-key"] = modelCopy.authKey;
+        },
+      };
+
+      formatHandlers[modelCopy.format as AiAdapter.Format]();
+
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      result = await (
+        await fetch(url, {
+          method: "POST",
+          headers,
+          body,
+        })
+      ).json();
+    }
 
     return { output: this.responseParser(result), raw: result };
   }

src/models.ts

@@ -1 +1 @@
-export { openai, anthropic, gemini } from "inngest";
+export { anthropic, gemini, openai } from "@inngest/ai";

src/network.ts

@@ -1,4 +1,4 @@
-import { type AiAdapter } from "inngest";
+import { type AiAdapter } from "@inngest/ai";
 import { z } from "zod";
 import {
   createRoutingAgent,

src/types.ts

@@ -1,13 +1,7 @@
-import { type GetStepTools, type Inngest } from "inngest";
 import { type output as ZodOutput } from "zod";
 import { type Agent } from "./agent";
 import { type NetworkRun } from "./networkRun";
-import {
-  type AnyZodType,
-  type GenericizeFunctionsInObject,
-  type MaybePromise,
-  type SimplifyDeep,
-} from "./util";
+import { type AnyZodType, type MaybePromise } from "./util";
 
 export type Tool<T extends AnyZodType> = {
   name: string;
@@ -69,17 +63,4 @@ export namespace MCP {
 export type ToolHandlerArgs = {
   agent: Agent;
   network?: NetworkRun;
-  step: GetStepTools<Inngest.Any>;
 };
-
-/**
- * Represents step tooling from an Inngest client, purposefully genericized to
- * allow for more flexible usage.
- *
- * Prefer use of `GetStepTools` in most cases, especially when you have access
- * to a client.
- */
-export type AnyStepTools = SimplifyDeep<
-  GenericizeFunctionsInObject<GetStepTools<Inngest.Any>>
-> &
-  Record<string, unknown>;

src/util.ts

@@ -1,4 +1,4 @@
-import { getAsyncCtx } from "inngest/experimental";
+import { type AsyncContext, getAsyncCtx } from "inngest/experimental";
 import { type ZodType } from "zod";
 
 export type MaybePromise<T> = T | Promise<T>;
@@ -29,16 +29,14 @@ export const stringifyError = (e: unknown): string => {
 };
 
 /**
- * Attempts to retrieve the step tools from the async context. If the context is
- * not found, an error is thrown.
+ * Attempts to retrieve the step tools from the async context.
  */
-export const getStepTools = async () => {
+export const getStepTools = async (): Promise<
+  AsyncContext["ctx"]["step"] | undefined
+> => {
   const asyncCtx = await getAsyncCtx();
-  if (!asyncCtx) {
-    throw new Error("Could not find Inngest step tooling in async context");
-  }
 
-  return asyncCtx.ctx.step;
+  return asyncCtx?.ctx.step;
 };
 
 /**