cli loads in client

Author: lalalune

.gitignore

@@ -91,4 +91,6 @@ packages/*/dist/*
 **/.docusaurus/**
 **/docs/build/**
 
-**lock**
+**lock**
+
+lerna-debug.log

lerna.json

@@ -1,15 +1,10 @@
 {
-  "version": "1.0.0-alpha.3",
-  "packages": [
-    "packages/*"
-  ],
-  "npmClient": "bun",
-  "command": {
-    "publish": {
-      "ignoreChanges": [
-        "packages/docs",
-        "packages/client"
-      ]
-    }
-  }
-}
+	"version": "1.0.0-alpha.3",
+	"packages": ["packages/*"],
+	"npmClient": "bun",
+	"command": {
+		"publish": {
+			"ignoreChanges": ["packages/docs", "packages/client"]
+		}
+	}
+}

packages/cli/package.json

@@ -42,10 +42,10 @@
 		"@babel/parser": "^7.22.6",
 		"@babel/plugin-transform-typescript": "^7.22.5",
 		"@elizaos/core": "workspace:*",
-		"@elizaos/plugin-sql": "*:workspace",
-		"@elizaos/client": "*:workspace",
-		"@elizaos/plugin-starter": "*:workspace",
-		"@elizaos/project-starter": "*:workspace",
+		"@elizaos/plugin-sql": "workspace:*",
+		"@elizaos/client": "workspace:*",
+		"@elizaos/plugin-starter": "workspace:*",
+		"@elizaos/project-starter": "workspace:*",
 		"@noble/curves": "^1.8.1",
 		"axios": "^1.7.9",
 		"chalk": "5.2.0",

packages/cli/src/server/api/index.ts

@@ -36,12 +36,7 @@ export function createApiRouter(
 			limit: getEnvVariable("EXPRESS_MAX_PAYLOAD") || "100kb",
 		}),
 	);
-
-	// Base routes
-	router.get("/", (_req, res) => {
-		res.send("Welcome, this is the REST API!");
-	});
-
+	
 	router.get("/hello", (_req, res) => {
 		res.json({ message: "Hello World!" });
 	});

packages/cli/src/server/index.ts

@@ -102,12 +102,9 @@ export class AgentServer {
 
 			// Serve client application
 			// First try to find it in the CLI package dist/client directory
-			let clientPath = path.join(__dirname, "../client");
+			const clientPath = path.join(__dirname, "./client");
 
-			// If not found, fall back to the old relative path for development
-			if (!fs.existsSync(clientPath)) {
-				clientPath = path.join(__dirname, "../../..", "packages/client/dist");
-			}
+			console.log("clientPath", clientPath);
 
 			if (fs.existsSync(clientPath)) {
 				logger.debug(
@@ -132,10 +129,10 @@ export class AgentServer {
 				this.app.use(express.static(clientPath, staticOptions));
 
 				// Serve the same files at /client path for consistency
-				this.app.use("/client", express.static(clientPath, staticOptions));
+				this.app.use("/", express.static(clientPath, staticOptions));
 
 				// Serve index.html for client root path
-				this.app.get("/client", (_req, res) => {
+				this.app.get("/", (_req, res) => {
 					res.setHeader("Content-Type", "text/html");
 					res.sendFile(path.join(clientPath, "index.html"));
 				});

packages/cli/src/utils/copy-template.ts

@@ -132,10 +132,10 @@ export async function copyClientDist() {
 	logger.info("Copying client dist files to CLI package");
 
 	// Determine source and destination paths
-	const srcClientDist = path.resolve(process.cwd(), "packages/client/dist");
+	const srcClientDist = path.resolve(process.cwd(), "../client/dist");
 	const destClientDist = path.resolve(
 		process.cwd(),
-		"packages/cli/dist/client",
+		"./dist/client",
 	);
 
 	// Create destination directory

packages/client/src/lib/info.json

@@ -1 +1 @@
-{ "version": "1.0.0-alpha.3" }
+{"version": "1.0.0-alpha.3"}