aixyz 0.1.2 → 0.2.4

package/accepts.ts

@@ -1,3 +1,7 @@
+import { z } from "zod";
+import { FacilitatorClient, HTTPFacilitatorClient } from "@x402/core/server";
+import { getFacilitatorClient } from "./facilitator";
+
 export type Accepts = AcceptsX402 | AcceptsFree;
 
 export type AcceptsX402 = {
@@ -10,3 +14,24 @@ export type AcceptsX402 = {
 export type AcceptsFree = {
   scheme: "free";
 };
+
+export const AcceptsScheme = z.discriminatedUnion("scheme", [
+  z.object({
+    scheme: z.literal("exact"),
+    price: z.string(),
+    network: z.string().optional(),
+    payTo: z.string().optional(),
+  }),
+  z.object({
+    scheme: z.literal("free"),
+  }),
+]);
+
+export type { FacilitatorClient };
+
+export { HTTPFacilitatorClient };
+
+/**
+ * The default facilitator client provided by aixyz.
+ */
+export const facilitator: FacilitatorClient = getFacilitatorClient();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aixyz",
-  "version": "0.1.2",
+  "version": "0.2.4",
   "description": "AI agent framework for building autonomous agents with X402 and ERC-8004 support.",
   "keywords": [
     "ai",
@@ -28,21 +28,19 @@
   ],
   "dependencies": {
     "@a2a-js/sdk": "^0.3.10",
-    "@aixyz/cli": "workspace:*",
-    "@aixyz/config": "workspace:*",
+    "@aixyz/cli": "0.0.0",
+    "@aixyz/config": "0.0.0",
     "@modelcontextprotocol/sdk": "^1.26.0",
-    "@next/env": "^16.1.6",
     "@x402/core": "^2.3.1",
     "@x402/evm": "^2.3.1",
     "@x402/express": "^2.3.0",
     "@x402/mcp": "^2.3.0",
-    "commander": "^13.0.0",
-    "express": "^5.2.1",
-    "jose": "^5.10.0",
-    "zod": "^4.3.6"
+    "express": "^5",
+    "jose": "^6.1.3",
+    "zod": "^4"
   },
   "devDependencies": {
-    "@types/express": "^5.0.6",
+    "@types/express": "^5",
     "ai": "^6"
   },
   "peerDependencies": {

package/server/adapters/a2a.ts

@@ -9,10 +9,10 @@ import {
 } from "@a2a-js/sdk/server";
 import { AgentCard, Message, TextPart } from "@a2a-js/sdk";
 import type { ToolLoopAgent, ToolSet } from "ai";
-import { getAixyzConfig } from "../../config";
+import { getAixyzConfigRuntime } from "../../config";
 import { AixyzServer } from "../index";
 import { agentCardHandler, jsonRpcHandler, UserBuilder } from "@a2a-js/sdk/server/express";
-import { Accepts } from "../../accepts";
+import { Accepts, AcceptsScheme } from "../../accepts";
 
 export class ToolLoopAgentExecutor<TOOLS extends ToolSet = ToolSet> implements AgentExecutor {
   constructor(private agent: ToolLoopAgent<never, TOOLS>) {}
@@ -63,7 +63,7 @@ export class ToolLoopAgentExecutor<TOOLS extends ToolSet = ToolSet> implements A
 }
 
 export function getAgentCard(): AgentCard {
-  const config = getAixyzConfig();
+  const config = getAixyzConfigRuntime();
   return {
     name: config.name,
     description: config.description,
@@ -88,7 +88,10 @@ export function useA2A<TOOLS extends ToolSet = ToolSet>(
   },
   taskStore: TaskStore = new InMemoryTaskStore(),
 ): void {
-  if (!exports.accepts) {
+  if (exports.accepts) {
+    // TODO(@fuxingloh): validation should be done at build stage
+    AcceptsScheme.parse(exports.accepts);
+  } else {
     // TODO(@fuxingloh): right now we just don't register the agent if accepts is not provided,
     //  but it might be a better idea to do it in aixyz-cli (aixyz-pack).
     return;
@@ -105,7 +108,7 @@ export function useA2A<TOOLS extends ToolSet = ToolSet>(
   );
 
   if (exports.accepts.scheme === "exact") {
-    app.withX402("POST /agent", exports.accepts);
+    app.withX402Exact("POST /agent", exports.accepts);
   }
 
   app.express.use(

package/server/adapters/mcp.ts

@@ -5,7 +5,7 @@ import express from "express";
 import type { IncomingMessage, ServerResponse } from "node:http";
 import { AixyzServer } from "../index";
 import { createPaymentWrapper } from "@x402/mcp";
-import { Accepts, AcceptsX402 } from "../../accepts";
+import { Accepts, AcceptsScheme, AcceptsX402 } from "../../accepts";
 
 export class AixyzMCP {
   private registeredTools: Array<{
@@ -60,7 +60,10 @@ export class AixyzMCP {
       accepts?: Accepts;
     },
   ) {
-    if (!exports.accepts) {
+    if (exports.accepts) {
+      // TODO(@fuxingloh): validation should be done at build stage
+      AcceptsScheme.parse(exports.accepts);
+    } else {
       // TODO(@fuxingloh): right now we just don't register the agent if accepts is not provided,
       //  but it might be a better idea to do it in aixyz-cli (aixyz-pack).
       return;

package/server/index.ts

@@ -1,24 +1,25 @@
 import { getAixyzConfig, Network } from "../config";
 import initExpress from "express";
-import { x402ResourceServer } from "@x402/core/server";
+import { FacilitatorClient, x402ResourceServer } from "@x402/core/server";
 import { paymentMiddleware, PaymentRequirements } from "@x402/express";
-import { getFacilitatorClient } from "../facilitator";
 import { ExactEvmScheme } from "@x402/evm/exact/server";
 import { z } from "zod";
 import { AcceptsX402 } from "../accepts";
+import { getFacilitatorClient } from "../facilitator";
 
 // TODO(@fuxingloh): rename to unstable_AixyzApp?
 export class AixyzServer extends x402ResourceServer {
   constructor(
+    facilitator: FacilitatorClient = getFacilitatorClient(),
     public config = getAixyzConfig(),
     public express: initExpress.Express = initExpress(),
   ) {
-    super(getFacilitatorClient());
+    super(facilitator);
     this.register(config.x402.network as any, new ExactEvmScheme());
   }
 
   public unstable_withIndexPage(path = "/") {
-    if (!path || typeof path !== "string" || !path.startsWith("/")) {
+    if (!path?.startsWith("/")) {
       throw new Error(`Invalid path: ${path}. Path must be a string starting with "/"`);
     }
 
@@ -57,7 +58,7 @@ export class AixyzServer extends x402ResourceServer {
 
   // TODO(@fuxingloh): add back x402 Bazaar compatibility
 
-  private withAccepts(accepts: AcceptsX402) {
+  private withSchemeExact(accepts: AcceptsX402) {
     const schema = z.object({
       scheme: z.literal("exact"),
       price: z.string(),
@@ -72,12 +73,12 @@ export class AixyzServer extends x402ResourceServer {
     return schema.parse(accepts);
   }
 
-  withX402(route: `${"GET" | "POST"} /${string}`, accepts: AcceptsX402) {
+  withX402Exact(route: `${"GET" | "POST"} /${string}`, accepts: AcceptsX402) {
     this.express.use(
       paymentMiddleware(
         {
           [route]: {
-            accepts: this.withAccepts(accepts),
+            accepts: this.withSchemeExact(accepts),
             mimeType: "application/json",
             description: `A2A Payment: ${this.config.description}`,
           },
@@ -91,6 +92,6 @@ export class AixyzServer extends x402ResourceServer {
   }
 
   async withPaymentRequirements(accepts: AcceptsX402): Promise<PaymentRequirements[]> {
-    return this.buildPaymentRequirements(this.withAccepts(accepts));
+    return this.buildPaymentRequirements(this.withSchemeExact(accepts));
   }
 }