@aixyz/cli 0.19.0 → 0.21.0

package/build/AixyzConfigPlugin.ts

@@ -7,9 +7,7 @@ function label(text: string): string {
   return chalk.dim(text.padEnd(14));
 }
 
-export function AixyzConfigPlugin(): BunPlugin {
-  const materialized = getAixyzConfig();
-
+function logConfig(materialized: ReturnType<typeof getAixyzConfig>): void {
   const maxLen = Math.max(materialized.url.length, materialized.x402.payTo.length);
   const description =
     materialized.description.length > maxLen
@@ -33,6 +31,11 @@ export function AixyzConfigPlugin(): BunPlugin {
       titleAlignment: "left",
     }),
   );
+}
+
+export function AixyzConfigPlugin(): BunPlugin {
+  const materialized = getAixyzConfig();
+  logConfig(materialized);
 
   return {
     name: "aixyz-config",

package/build/AixyzServerPlugin.ts

@@ -1,9 +1,13 @@
 import type { BunPlugin } from "bun";
-import { existsSync, mkdirSync, readdirSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs";
 import { resolve, relative, join } from "path";
 import { getAixyzConfig } from "@aixyz/config";
 
-export function AixyzServerPlugin(entrypoint: string, mode: "vercel" | "standalone" | "executable"): BunPlugin {
+export function AixyzServerPlugin(
+  entrypoint: string,
+  mode: "vercel" | "standalone" | "executable",
+  isCustom = false,
+): BunPlugin {
   return {
     name: "aixyz-entrypoint",
     setup(build) {
@@ -12,44 +16,58 @@ export function AixyzServerPlugin(entrypoint: string, mode: "vercel" | "standalo
 
         const source = await Bun.file(args.path).text();
 
-        if (mode === "vercel") {
-          // For Vercel, export server.express for serverless function
-          const transformed = source.replace(/export\s+default\s+(\w+)\s*;/, "export default $1.express;");
-          return { contents: transformed, loader: "ts" };
+        // Custom server.ts manages its own lifecycle — pass through as-is
+        if (isCustom || mode === "vercel") {
+          return { contents: source, loader: "ts" };
+        }
+
+        // For generated entrypoints in standalone/executable, rewrite `export default ...` into Bun.serve().
+        // Supports both identifier exports (`export default app;`) and
+        // expression exports (`export default new AixyzApp({...});`).
+        const identifierRe = /export\s+default\s+(\w+)\s*;/;
+        const expressionRe = /export\s+default\s+/;
+
+        let transformed: string;
+        const identifierMatch = source.match(identifierRe);
+        if (identifierMatch) {
+          transformed = source.replace(
+            identifierRe,
+            `const __server = Bun.serve({ port: parseInt(process.env.PORT || "3000", 10), fetch: ${identifierMatch[1]}.fetch });\nconsole.log(\`Server listening on port \${__server.port}\`);`,
+          );
+        } else if (expressionRe.test(source)) {
+          transformed = source.replace(expressionRe, `const __app = `);
+          transformed += `\nconst __server = Bun.serve({ port: parseInt(process.env.PORT || "3000", 10), fetch: __app.fetch });\nconsole.log(\`Server listening on port \${__server.port}\`);`;
         } else {
-          // For standalone and executable, keep the server export but add startup code
-          // TODO(@fuxingloh): use Bun.serve later.
-          const transformed = source.replace(
-            /export\s+default\s+(\w+)\s*;/,
-            `export default $1;
-
-// Auto-start server when run directly
-if (import.meta.main) {
-  const port = parseInt(process.env.PORT || "3000", 10);
-  $1.express.listen(port, () => {
-    console.log(\`Server listening on port \${port}\`);
-  });
-}`,
+          throw new Error(
+            `[aixyz] Could not find \`export default\` in entrypoint ${args.path}. ` +
+              `Standalone and executable builds require the server entrypoint to use \`export default app;\` ` +
+              `or \`export default new AixyzApp({...});\`.`,
           );
-          return { contents: transformed, loader: "ts" };
         }
+        return { contents: transformed, loader: "ts" };
       });
     },
   };
 }
 
-export function getEntrypointMayGenerate(cwd: string, appDirName: string, mode: "dev" | "build"): string {
+export type Entrypoint = { path: string; isCustom: boolean };
+
+export function getEntrypointMayGenerate(cwd: string, appDirName: string, mode: "dev" | "build"): Entrypoint {
   const appDir = resolve(cwd, appDirName);
+  const serverFile = resolve(appDir, "server.ts");
 
-  if (existsSync(resolve(appDir, "server.ts"))) {
-    return resolve(appDir, "server.ts");
+  if (existsSync(serverFile)) {
+    const source = readFileSync(serverFile, "utf-8");
+    // assume that export default has `.fetch` typically `app`
+    const hasExportDefault = /export\s+default\s+/.test(source);
+    return { path: serverFile, isCustom: !hasExportDefault };
   }
 
   const devDir = resolve(cwd, join(".aixyz", mode));
   mkdirSync(devDir, { recursive: true });
   const entrypoint = resolve(devDir, "server.ts");
   writeFileSync(entrypoint, generateServer(appDir, devDir));
-  return entrypoint;
+  return { path: entrypoint, isCustom: false };
 }
 
 class AixyzGlob {
@@ -109,7 +127,8 @@ function generateServer(appDir: string, entrypointDir: string): string {
   const imports: string[] = [];
   const body: string[] = [];
 
-  imports.push('import { AixyzServer } from "aixyz/server";');
+  imports.push('import { AixyzApp } from "aixyz/app";');
+  imports.push('import { IndexPagePlugin } from "aixyz/app/plugins/index-page";');
 
   const hasAccepts = existsSync(resolve(appDir, "accepts.ts"));
   if (hasAccepts) {
@@ -119,16 +138,15 @@ function generateServer(appDir: string, entrypointDir: string): string {
   }
 
   const rootAgent = glob.hasRootAgent(appDir);
-  if (rootAgent) {
-    imports.push('import { useA2A } from "aixyz/server/adapters/a2a";');
-    imports.push(`import * as agent from "${importPrefix}/agent";`);
-  }
-
   const agentsDir = resolve(appDir, "agents");
   const subAgents = glob.getAgents(agentsDir);
+  const needsA2A = rootAgent || subAgents.length > 0;
 
-  if (!rootAgent && subAgents.length > 0) {
-    imports.push('import { useA2A } from "aixyz/server/adapters/a2a";');
+  if (needsA2A) {
+    imports.push('import { A2APlugin } from "aixyz/app/plugins/a2a";');
+  }
+  if (rootAgent) {
+    imports.push(`import * as agent from "${importPrefix}/agent";`);
   }
   for (const subAgent of subAgents) {
     imports.push(`import * as ${subAgent.identifier} from "${importPrefix}/agents/${subAgent.name}";`);
@@ -138,45 +156,49 @@ function generateServer(appDir: string, entrypointDir: string): string {
   const tools = glob.getTools(toolsDir);
 
   if (tools.length > 0) {
-    imports.push('import { AixyzMCP } from "aixyz/server/adapters/mcp";');
+    imports.push('import { MCPPlugin } from "aixyz/app/plugins/mcp";');
     for (const tool of tools) {
       imports.push(`import * as ${tool.identifier} from "${importPrefix}/tools/${tool.name}";`);
     }
   }
 
-  body.push("const server = new AixyzServer(facilitator);");
-  body.push("await server.initialize();");
-  body.push("server.unstable_withIndexPage();");
+  // If app/erc-8004.ts exists, auto-register ERC-8004 endpoint
+  const hasErc8004 = existsSync(resolve(appDir, "erc-8004.ts"));
+  if (hasErc8004) {
+    imports.push('import { ERC8004Plugin } from "aixyz/app/plugins/erc-8004";');
+    imports.push(`import * as erc8004 from "${importPrefix}/erc-8004";`);
+  }
+
+  body.push("const app = new AixyzApp({ facilitators: facilitator });");
+  body.push("await app.withPlugin(new IndexPagePlugin());");
 
   if (rootAgent) {
-    body.push("useA2A(server, agent);");
+    body.push("await app.withPlugin(new A2APlugin(agent));");
   }
-
   for (const subAgent of subAgents) {
-    body.push(`useA2A(server, ${subAgent.identifier}, "${subAgent.name}");`);
+    body.push(`await app.withPlugin(new A2APlugin(${subAgent.identifier}, "${subAgent.name}"));`);
   }
+
   if (tools.length > 0) {
-    body.push("const mcp = new AixyzMCP(server);");
-    for (const tool of tools) {
-      body.push(`await mcp.register("${tool.name}", ${tool.identifier});`);
+    const toolEntries = tools.map((tool) => `  { name: "${tool.name}", exports: ${tool.identifier} },`);
+    body.push(`await app.withPlugin(new MCPPlugin([`);
+    for (const entry of toolEntries) {
+      body.push(entry);
     }
-    body.push("await mcp.connect();");
+    body.push(`]));`);
   }
 
-  // If app/erc-8004.ts exists, auto-register ERC-8004 endpoint
-  const hasErc8004 = existsSync(resolve(appDir, "erc-8004.ts"));
   if (hasErc8004) {
-    imports.push('import { useERC8004 } from "aixyz/server/adapters/erc-8004";');
-    imports.push(`import * as erc8004 from "${importPrefix}/erc-8004";`);
     const a2aPaths: string[] = [];
     if (rootAgent) a2aPaths.push("/.well-known/agent-card.json");
     for (const subAgent of subAgents) a2aPaths.push(`/${subAgent.name}/.well-known/agent-card.json`);
     body.push(
-      `useERC8004(server, { default: erc8004.default, options: { mcp: ${tools.length > 0}, a2a: ${JSON.stringify(a2aPaths)} } });`,
+      `await app.withPlugin(new ERC8004Plugin({ default: erc8004.default, options: { mcp: ${tools.length > 0}, a2a: ${JSON.stringify(a2aPaths)} } }));`,
     );
   }
 
-  body.push("export default server;");
+  body.push("await app.initialize();");
+  body.push("export default app;");
 
   return [...imports, "", ...body].join("\n");
 }

package/build/index.ts

@@ -63,21 +63,21 @@ export async function action(options: BuildOptions = {}): Promise<void> {
   const config = getAixyzConfig();
   const target = options.output ?? config.build?.output ?? (process.env.VERCEL === "1" ? "vercel" : "standalone");
   const appDir = options.appDir || "app";
-  const entrypoint = getEntrypointMayGenerate(cwd, appDir, "build");
+  const { path: entrypoint, isCustom } = getEntrypointMayGenerate(cwd, appDir, "build");
 
   if (target === "vercel") {
     console.log(chalk.cyan("▶") + " Building for " + chalk.bold("Vercel") + "...");
-    await buildVercel(entrypoint, config);
+    await buildVercel(entrypoint, config, isCustom);
   } else if (target === "executable") {
     console.log(chalk.cyan("▶") + " Building " + chalk.bold("Executable") + "...");
-    await buildExecutable(entrypoint);
+    await buildExecutable(entrypoint, isCustom);
   } else {
     console.log(chalk.cyan("▶") + " Building for " + chalk.bold("Standalone") + "...");
-    await buildBun(entrypoint);
+    await buildBun(entrypoint, isCustom);
   }
 }
 
-async function buildBun(entrypoint: string): Promise<void> {
+async function buildBun(entrypoint: string, isCustom: boolean): Promise<void> {
   const cwd = process.cwd();
 
   const outputDir = resolve(cwd, ".aixyz/output");
@@ -96,7 +96,7 @@ async function buildBun(entrypoint: string): Promise<void> {
       "process.env.NODE_ENV": JSON.stringify("production"),
       "process.env.AIXYZ_ENV": JSON.stringify("production"),
     },
-    plugins: [AixyzConfigPlugin(), AixyzServerPlugin(entrypoint, "standalone")],
+    plugins: [AixyzConfigPlugin(), AixyzServerPlugin(entrypoint, "standalone", isCustom)],
   });
 
   if (!result.success) {
@@ -136,7 +136,7 @@ async function buildBun(entrypoint: string): Promise<void> {
   console.log("To run: bun .aixyz/output/server.js");
 }
 
-async function buildExecutable(entrypoint: string): Promise<void> {
+async function buildExecutable(entrypoint: string, isCustom: boolean): Promise<void> {
   const cwd = process.cwd();
 
   const outputDir = resolve(cwd, ".aixyz/output");
@@ -156,7 +156,7 @@ async function buildExecutable(entrypoint: string): Promise<void> {
       "process.env.NODE_ENV": JSON.stringify("production"),
       "process.env.AIXYZ_ENV": JSON.stringify("production"),
     },
-    plugins: [AixyzConfigPlugin(), AixyzServerPlugin(entrypoint, "executable")],
+    plugins: [AixyzConfigPlugin(), AixyzServerPlugin(entrypoint, "executable", isCustom)],
   });
 
   if (!result.success) {
@@ -192,7 +192,11 @@ async function buildExecutable(entrypoint: string): Promise<void> {
   console.log("To run: ./.aixyz/output/server");
 }
 
-async function buildVercel(entrypoint: string, config: ReturnType<typeof getAixyzConfig>): Promise<void> {
+async function buildVercel(
+  entrypoint: string,
+  config: ReturnType<typeof getAixyzConfig>,
+  isCustom: boolean,
+): Promise<void> {
   const cwd = process.cwd();
 
   const outputDir = resolve(cwd, ".vercel/output");
@@ -213,7 +217,7 @@ async function buildVercel(entrypoint: string, config: ReturnType<typeof getAixy
       "process.env.NODE_ENV": JSON.stringify("production"),
       "process.env.AIXYZ_ENV": JSON.stringify("production"),
     },
-    plugins: [AixyzConfigPlugin(), AixyzServerPlugin(entrypoint, "vercel")],
+    plugins: [AixyzConfigPlugin(), AixyzServerPlugin(entrypoint, "vercel", isCustom)],
   });
 
   if (!result.success) {

package/dev/index.ts

@@ -8,7 +8,7 @@ import pkg from "../package.json";
 
 export const devCommand = new Command("dev")
   .description("Start a local development server")
-  .option("-p, --port <port>", "Port to listen on", "3000")
+  .option("-p, --port <port>", "Port to listen on")
   .action(action);
 
 type DevOptions = {
@@ -45,8 +45,10 @@ export async function action(options: DevOptions): Promise<void> {
   let restarting = false;
 
   function startServer() {
-    const endpoint = getEntrypointMayGenerate(cwd, appDir, "dev");
-    child = Bun.spawn(["bun", workerPath, endpoint, port], {
+    const { path: endpoint, isCustom } = getEntrypointMayGenerate(cwd, appDir, "dev");
+    const args = ["bun", workerPath, endpoint, port];
+    if (isCustom) args.push("custom");
+    child = Bun.spawn(args, {
       cwd,
       stdout: "inherit",
       stderr: "inherit",

package/dev/worker.ts

@@ -3,26 +3,39 @@ import chalk from "chalk";
 async function main() {
   const entrypoint = process.argv[2];
   const port = parseInt(process.argv[3], 10);
+  const isCustom = process.argv[4] === "custom";
 
   if (!entrypoint || isNaN(port)) {
-    console.error("Usage: dev-worker <entrypoint> <port>");
+    console.error("Usage: dev-worker <entrypoint> <port> [custom]");
     process.exit(1);
   }
 
+  // Expose port so config.url fallback picks it up
+  process.env.PORT = String(port);
+
   const startTime = performance.now();
   const mod = await import(entrypoint);
+
+  if (isCustom) {
+    // Custom server.ts manages its own lifecycle (e.g. Express, Fastify)
+    const duration = Math.round(performance.now() - startTime);
+    console.log(chalk.blueBright("✓") + ` Ready in ${duration}ms`);
+    console.log("");
+    return;
+  }
+
   const app = mod.default;
 
-  if (!app || typeof app.express?.listen !== "function") {
+  if (!app || typeof app.fetch !== "function") {
     console.error("Error: Entrypoint must default-export an AixyzApp");
     process.exit(1);
   }
 
-  app.express.listen(port, () => {
-    const duration = Math.round(performance.now() - startTime);
-    console.log(chalk.blueBright("✓") + ` Ready in ${duration}ms`);
-    console.log("");
-  });
+  const server = Bun.serve({ port, fetch: app.fetch });
+
+  const duration = Math.round(performance.now() - startTime);
+  console.log(chalk.blueBright("✓") + ` Ready in ${duration}ms`);
+  console.log("");
 }
 
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aixyz/cli",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "description": "Payment-native SDK for AI Agent",
   "keywords": [
     "ai",
@@ -28,8 +28,8 @@
     "bin.ts"
   ],
   "dependencies": {
-    "@aixyz/config": "0.19.0",
-    "@aixyz/erc-8004": "0.19.0",
+    "@aixyz/config": "0.21.0",
+    "@aixyz/erc-8004": "0.21.0",
     "@inquirer/prompts": "^8.3.0",
     "@next/env": "^16.1.6",
     "boxen": "^8.0.1",