hybrid 1.3.0 → 1.3.1

package/dist/{index-CWnGnicw.d.cts → index-OIwixwWD.d.cts}

@@ -27,7 +27,7 @@ type DefaultRuntimeExtension = Record<string, never>;
 /**
  * Configuration interface for creating custom tools that integrate with AI SDK.
  */
-interface ToolConfig<TInput extends z.ZodTypeAny = z.ZodTypeAny, TOutput extends z.ZodTypeAny = z.ZodTypeAny, TRuntimeExtension = DefaultRuntimeExtension> {
+interface ToolConfig<TInput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny> = z.ZodTypeAny, TOutput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny> = z.ZodTypeAny, TRuntimeExtension = DefaultRuntimeExtension> {
     /** Unique identifier for the tool */
     id: string;
     /** Human-readable description of what the tool does */
@@ -47,7 +47,7 @@ interface ToolConfig<TInput extends z.ZodTypeAny = z.ZodTypeAny, TOutput extends
  * Internal tool interface used throughout the agent framework.
  * Similar to ToolConfig but without the ID field, used after tool creation.
  */
-interface Tool<TInput extends z.ZodTypeAny = z.ZodTypeAny, TOutput extends z.ZodTypeAny = z.ZodTypeAny, TRuntimeExtension = DefaultRuntimeExtension> {
+interface Tool<TInput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny> = z.ZodTypeAny, TOutput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny> = z.ZodTypeAny, TRuntimeExtension = DefaultRuntimeExtension> {
     /** Human-readable description of what the tool does */
     description: string;
     /** Zod schema for validating tool input */
@@ -65,12 +65,12 @@ interface Tool<TInput extends z.ZodTypeAny = z.ZodTypeAny, TOutput extends z.Zod
  * Factory function to create tools with custom runtime extensions.
  * Provides proper type inference for input/output schemas and runtime extensions.
  */
-declare function toolFactory<TRuntimeExtension = DefaultRuntimeExtension>(): <TInput extends z.ZodTypeAny, TOutput extends z.ZodTypeAny = z.ZodTypeAny>(config: ToolConfig<TInput, TOutput, TRuntimeExtension>) => Tool<TInput, TOutput, TRuntimeExtension>;
+declare function toolFactory<TRuntimeExtension = DefaultRuntimeExtension>(): <TInput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny>, TOutput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny> = z.ZodTypeAny>(config: ToolConfig<TInput, TOutput, TRuntimeExtension>) => Tool<TInput, TOutput, TRuntimeExtension>;
 /**
  * Default tool factory with no runtime extensions.
  * Type-safe at creation time with proper schema inference.
  */
-declare const createTool: <TInput extends z.ZodTypeAny, TOutput extends z.ZodTypeAny = z.ZodTypeAny>(config: ToolConfig<TInput, TOutput, DefaultRuntimeExtension>) => Tool<TInput, TOutput, DefaultRuntimeExtension>;
+declare const createTool: <TInput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny>, TOutput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny> = z.ZodTypeAny>(config: ToolConfig<TInput, TOutput, DefaultRuntimeExtension>) => Tool<TInput, TOutput, DefaultRuntimeExtension>;
 
 declare const SUPPORTED_CHAINS: {
     readonly mainnet: {

package/dist/{index-CWnGnicw.d.ts → index-OIwixwWD.d.ts}

@@ -27,7 +27,7 @@ type DefaultRuntimeExtension = Record<string, never>;
 /**
  * Configuration interface for creating custom tools that integrate with AI SDK.
  */
-interface ToolConfig<TInput extends z.ZodTypeAny = z.ZodTypeAny, TOutput extends z.ZodTypeAny = z.ZodTypeAny, TRuntimeExtension = DefaultRuntimeExtension> {
+interface ToolConfig<TInput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny> = z.ZodTypeAny, TOutput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny> = z.ZodTypeAny, TRuntimeExtension = DefaultRuntimeExtension> {
     /** Unique identifier for the tool */
     id: string;
     /** Human-readable description of what the tool does */
@@ -47,7 +47,7 @@ interface ToolConfig<TInput extends z.ZodTypeAny = z.ZodTypeAny, TOutput extends
  * Internal tool interface used throughout the agent framework.
  * Similar to ToolConfig but without the ID field, used after tool creation.
  */
-interface Tool<TInput extends z.ZodTypeAny = z.ZodTypeAny, TOutput extends z.ZodTypeAny = z.ZodTypeAny, TRuntimeExtension = DefaultRuntimeExtension> {
+interface Tool<TInput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny> = z.ZodTypeAny, TOutput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny> = z.ZodTypeAny, TRuntimeExtension = DefaultRuntimeExtension> {
     /** Human-readable description of what the tool does */
     description: string;
     /** Zod schema for validating tool input */
@@ -65,12 +65,12 @@ interface Tool<TInput extends z.ZodTypeAny = z.ZodTypeAny, TOutput extends z.Zod
  * Factory function to create tools with custom runtime extensions.
  * Provides proper type inference for input/output schemas and runtime extensions.
  */
-declare function toolFactory<TRuntimeExtension = DefaultRuntimeExtension>(): <TInput extends z.ZodTypeAny, TOutput extends z.ZodTypeAny = z.ZodTypeAny>(config: ToolConfig<TInput, TOutput, TRuntimeExtension>) => Tool<TInput, TOutput, TRuntimeExtension>;
+declare function toolFactory<TRuntimeExtension = DefaultRuntimeExtension>(): <TInput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny>, TOutput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny> = z.ZodTypeAny>(config: ToolConfig<TInput, TOutput, TRuntimeExtension>) => Tool<TInput, TOutput, TRuntimeExtension>;
 /**
  * Default tool factory with no runtime extensions.
  * Type-safe at creation time with proper schema inference.
  */
-declare const createTool: <TInput extends z.ZodTypeAny, TOutput extends z.ZodTypeAny = z.ZodTypeAny>(config: ToolConfig<TInput, TOutput, DefaultRuntimeExtension>) => Tool<TInput, TOutput, DefaultRuntimeExtension>;
+declare const createTool: <TInput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny>, TOutput extends z.ZodTypeAny | z.ZodEffects<z.ZodTypeAny> = z.ZodTypeAny>(config: ToolConfig<TInput, TOutput, DefaultRuntimeExtension>) => Tool<TInput, TOutput, DefaultRuntimeExtension>;
 
 declare const SUPPORTED_CHAINS: {
     readonly mainnet: {

package/dist/index.cjs

@@ -81,16 +81,16 @@ var import_chains = require("viem/chains");
 // src/lib/jwt.ts
 var import_jsonwebtoken = __toESM(require("jsonwebtoken"), 1);
 var JWT_SECRET = (() => {
-  const secret = process.env.XMTP_JWT_SECRET;
+  const secret = process.env.XMTP_ENCRYPTION_KEY;
   const nodeEnv = process.env.NODE_ENV || "development";
   if (nodeEnv === "production" && !secret) {
     throw new Error(
-      "XMTP_JWT_SECRET environment variable is required in production. Generate a secure random secret for JWT token signing."
+      "XMTP_ENCRYPTION_KEY environment variable is required in production. Generate a secure random secret for JWT token signing."
     );
   }
   if (!secret) {
     console.warn(
-      "\u26A0\uFE0F  [SECURITY] Using fallback JWT secret for development. Set XMTP_JWT_SECRET environment variable for production."
+      "\u26A0\uFE0F  [SECURITY] Using fallback JWT secret for development. Set XMTP_ENCRYPTION_KEY environment variable for production."
     );
     return "fallback-secret-for-dev-only";
   }
@@ -129,6 +129,221 @@ function generateXMTPToolsToken(payload) {
 var BG_STARTED = Symbol("BG_STARTED");
 var BG_STATE = Symbol("BG_STATE");
 var BG_STOP = Symbol("BG_STOP");
+function sleep(ms, signal) {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(new Error("AbortError"));
+      return;
+    }
+    const timeout = setTimeout(resolve, ms);
+    if (signal) {
+      signal.addEventListener(
+        "abort",
+        () => {
+          clearTimeout(timeout);
+          reject(new Error("AbortError"));
+        },
+        { once: true }
+      );
+    }
+  });
+}
+function createBackgroundMessageProcessor(opts) {
+  if (!opts?.agent || !opts?.xmtpClient) {
+    throw new Error(
+      "createBackgroundMessageProcessor: agent and xmtpClient are required"
+    );
+  }
+  const intervalMs = Math.max(250, opts.intervalMs ?? 5e3);
+  const baseBackoffMs = Math.max(100, opts.backoffMs ?? 1e3);
+  const maxBackoffMs = Math.max(baseBackoffMs, opts.maxBackoffMs ?? 3e4);
+  if (!globalThis[BG_STARTED]) {
+    ;
+    globalThis[BG_STARTED] = true;
+    const state = {
+      running: true,
+      lastStartAt: Date.now(),
+      consecutiveErrors: 0,
+      messagesProcessed: 0,
+      listenerRunning: false
+    };
+    globalThis[BG_STATE] = state;
+    const ac = new AbortController();
+    const signal = ac.signal;
+    const stop = () => {
+      if (!state.running) return;
+      state.running = false;
+      ac.abort();
+      console.log("[XMTP Background] Stopping message processor...");
+    };
+    globalThis[BG_STOP] = stop;
+    process.once("SIGINT", stop);
+    process.once("SIGTERM", stop);
+    const publicClient = (0, import_viem.createPublicClient)({
+      chain: import_chains.base,
+      transport: (0, import_viem.http)()
+    });
+    const listener = new import_xmtp.MessageListener({
+      publicClient,
+      xmtpClient: opts.xmtpClient,
+      filter: opts.messageFilter,
+      heartbeatInterval: 5 * 60 * 1e3,
+      // 5 minutes
+      conversationCheckInterval: 30 * 1e3
+      // 30 seconds
+    });
+    listener.on("message", async (messageEvent) => {
+      try {
+        console.log(
+          `[XMTP Background] Processing message: ${messageEvent.message.content}`
+        );
+        console.log(
+          `[XMTP Background] Sender: ${messageEvent.sender?.address || "unknown"}`
+        );
+        console.log(
+          `[XMTP Background] Conversation: ${messageEvent.message.conversationId}`
+        );
+        const messages = [
+          {
+            id: (0, import_node_crypto.randomUUID)(),
+            role: "user",
+            parts: [
+              {
+                type: "text",
+                text: messageEvent.message.content?.toString() || ""
+              }
+            ]
+          }
+        ];
+        const serviceUrl = process.env.AGENT_URL || "http://localhost:8454";
+        const serviceToken = generateXMTPToolsToken({
+          action: "send",
+          conversationId: messageEvent.message.conversationId,
+          content: messageEvent.message.content?.toString() || ""
+        });
+        const serviceClient = (0, import_xmtp.createAuthenticatedXmtpClient)(
+          serviceUrl,
+          serviceToken
+        );
+        const baseRuntime = {
+          chatId: messageEvent.message.conversationId,
+          messages,
+          conversation: messageEvent.conversation,
+          message: messageEvent.message,
+          parentMessage: messageEvent.parentMessage,
+          rootMessage: messageEvent.rootMessage,
+          sender: messageEvent.sender,
+          subjects: messageEvent.subjects,
+          xmtpClient: serviceClient
+        };
+        const runtime = await opts.agent.createRuntimeContext(baseRuntime);
+        console.log("[XMTP Background] Calling agent to process message...");
+        const result = await opts.agent.generate(messages, { runtime });
+        if (result.text) {
+          await messageEvent.conversation.send(result.text);
+          console.log(`[XMTP Background] Agent response sent: ${result.text}`);
+        }
+        state.messagesProcessed++;
+        state.lastOkAt = Date.now();
+        state.consecutiveErrors = 0;
+        console.log(
+          `[XMTP Background] Message processed successfully. Total: ${state.messagesProcessed}`
+        );
+      } catch (error) {
+        state.lastErrAt = Date.now();
+        state.consecutiveErrors++;
+        console.error("[XMTP Background] Error processing message:", error);
+        try {
+          await messageEvent.conversation.send(
+            "Sorry, I encountered an error processing your message."
+          );
+        } catch (sendError) {
+          console.error(
+            "[XMTP Background] Failed to send error message:",
+            sendError
+          );
+        }
+      }
+    });
+    listener.on("error", (error) => {
+      state.lastErrAt = Date.now();
+      state.consecutiveErrors++;
+      console.error("[XMTP Background] Message listener error:", error);
+    });
+    listener.on("started", () => {
+      state.listenerRunning = true;
+      console.log("[XMTP Background] Message listener started");
+    });
+    listener.on("stopped", () => {
+      state.listenerRunning = false;
+      console.log("[XMTP Background] Message listener stopped");
+    });
+    listener.on("heartbeat", (stats) => {
+      console.log(
+        `[XMTP Background] Heartbeat - Messages: ${stats.messageCount}, Conversations: ${stats.conversationCount}`
+      );
+    });
+    (async function supervise() {
+      let nextDelay = intervalMs;
+      while (state.running) {
+        try {
+          if (!state.listenerRunning) {
+            console.log("[XMTP Background] Starting message listener...");
+            await listener.start();
+          }
+          if (state.listenerRunning) {
+            state.lastOkAt = Date.now();
+            state.consecutiveErrors = 0;
+            nextDelay = intervalMs;
+          } else {
+            throw new Error("Message listener is not running");
+          }
+        } catch (error) {
+          state.lastErrAt = Date.now();
+          state.consecutiveErrors += 1;
+          const backoff = Math.min(
+            maxBackoffMs,
+            baseBackoffMs * 2 ** (state.consecutiveErrors - 1)
+          );
+          nextDelay = backoff;
+          console.error("[XMTP Background] Supervisor error:", error);
+          try {
+            if (state.listenerRunning) {
+              await listener.stop();
+            }
+            await sleep(1e3);
+          } catch (restartError) {
+            console.error(
+              "[XMTP Background] Error restarting listener:",
+              restartError
+            );
+          }
+        }
+        try {
+          await sleep(nextDelay, signal);
+        } catch (error) {
+          if (error instanceof Error && error.name === "AbortError") {
+            break;
+          }
+          throw error;
+        }
+      }
+      try {
+        if (state.listenerRunning) {
+          console.log("[XMTP Background] Stopping message listener...");
+          await listener.stop();
+        }
+      } catch (error) {
+        console.error("[XMTP Background] Error stopping listener:", error);
+      }
+      console.log("[XMTP Background] Supervisor stopped");
+    })();
+    console.log(
+      "[XMTP Background] Message processor started (always-on, in-process)"
+    );
+  }
+  return async (_c, next) => next();
+}
 function getBgState() {
   return globalThis[BG_STATE];
 }
@@ -138,6 +353,12 @@ function stopBackground() {
 }
 
 // src/server/listen.ts
+function createHonoMiddleware(client) {
+  return async (c, next) => {
+    c.set("xmtpClient", client);
+    return next();
+  };
+}
 async function listen({
   agent,
   port,
@@ -148,6 +369,33 @@ async function listen({
   const context = {
     agent
   };
+  const { XMTP_WALLET_KEY, XMTP_ENCRYPTION_KEY } = process.env;
+  if (!XMTP_WALLET_KEY) {
+    throw new Error("XMTP_WALLET_KEY must be set");
+  }
+  if (!XMTP_ENCRYPTION_KEY) {
+    throw new Error("XMTP_ENCRYPTION_KEY must be set");
+  }
+  const cloudflareStoragePath = (0, import_utils.getCloudflareStoragePath)("xmtp");
+  const xmtpClient = await (0, import_xmtp2.createXMTPClient)(XMTP_WALLET_KEY, {
+    persist: true,
+    storagePath: cloudflareStoragePath
+  });
+  app.use(createHonoMiddleware(xmtpClient));
+  app.use(
+    createBackgroundMessageProcessor({
+      agent,
+      xmtpClient,
+      messageFilter: filter,
+      // Use the provided filter
+      intervalMs: 5e3,
+      // Check every 5 seconds
+      backoffMs: 1e3,
+      // Start with 1 second backoff
+      maxBackoffMs: 3e4
+      // Max 30 seconds backoff
+    })
+  );
   const xmtpPlugin = (0, import_xmtp2.XMTPPlugin)({
     filter
   });
@@ -206,7 +454,8 @@ async function listen({
       fetch: app.fetch,
       port: httpPort
     });
-    console.log(`\u2705 XMTP Tools HTTP Server running on port ${httpPort}`);
+    console.log(`\u2705 Hybrid server running on port ${httpPort}`);
+    console.log(`\u{1F3A7} Background message listener is active`);
   } catch (error) {
     if (error.code === "EADDRINUSE") {
       console.error(