@elizaos/server 1.1.3 → 1.1.5

package/dist/index.js

@@ -392,6 +392,7 @@ import express31 from "express";
 import helmet2 from "helmet";
 import * as fs9 from "fs";
 import http from "http";
+import os2 from "os";
 import path9, { basename, dirname, extname, join } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
@@ -3816,7 +3817,7 @@ import express28 from "express";
 // package.json
 var package_default = {
   name: "@elizaos/server",
-  version: "1.1.3",
+  version: "1.1.5",
   description: "ElizaOS Server - Core server infrastructure for ElizaOS agents",
   publishConfig: {
     access: "public",
@@ -3868,10 +3869,10 @@ var package_default = {
     which: "^4.0.0",
     ws: "^8.18.0"
   },
-  gitHead: "90c477c53a184c0e33a58b862958b88a200296d6",
+  gitHead: "4d7e96cd1335e2764cc913b40d31abe18a6c8400",
   dependencies: {
-    "@elizaos/core": "1.1.3",
-    "@elizaos/plugin-sql": "1.1.3",
+    "@elizaos/core": "1.1.5",
+    "@elizaos/plugin-sql": "1.1.5",
     "@types/express": "^5.0.2",
     "@types/helmet": "^4.0.0",
     "@types/multer": "^1.4.13",
@@ -4393,6 +4394,11 @@ function createPluginRouteHandler(agents) {
     if (req.path.startsWith("/api/messages/")) {
       return next();
     }
+    const clientRoutePattern = /^\/(chat|settings|agents|profile|dashboard|login|register|admin|home|about)\b/i;
+    if (clientRoutePattern.test(req.path)) {
+      logger25.debug(`Skipping client-side route in plugin handler: ${req.path}`);
+      return next();
+    }
     if (req.path.endsWith(".js") || req.path.includes(".js?") || req.path.match(/index-[A-Za-z0-9]{8}\.js/)) {
       logger25.debug(`JavaScript request in plugin handler: ${req.method} ${req.path}`);
       res.setHeader("Content-Type", "application/javascript");
@@ -4494,25 +4500,33 @@ function createPluginRouteHandler(agents) {
         logger25.warn(
           `Agent ID ${agentIdFromQuery} provided in query, but agent runtime not found. Path: ${reqPath}.`
         );
-        res.status(404).json({
+        if (reqPath.startsWith("/api/")) {
+          res.status(404).json({
+            success: false,
+            error: {
+              message: "Agent not found",
+              code: "AGENT_NOT_FOUND"
+            }
+          });
+          return;
+        } else {
+          return next();
+        }
+      }
+    } else if (agentIdFromQuery && !validateUuid21(agentIdFromQuery)) {
+      logger25.warn(`Invalid Agent ID format in query: ${agentIdFromQuery}. Path: ${reqPath}.`);
+      if (reqPath.startsWith("/api/")) {
+        res.status(400).json({
           success: false,
           error: {
-            message: "Agent not found",
-            code: "AGENT_NOT_FOUND"
+            message: "Invalid agent ID format",
+            code: "INVALID_AGENT_ID"
           }
         });
         return;
+      } else {
+        return next();
       }
-    } else if (agentIdFromQuery && !validateUuid21(agentIdFromQuery)) {
-      logger25.warn(`Invalid Agent ID format in query: ${agentIdFromQuery}. Path: ${reqPath}.`);
-      res.status(400).json({
-        success: false,
-        error: {
-          message: "Invalid agent ID format",
-          code: "INVALID_AGENT_ID"
-        }
-      });
-      return;
     } else {
       logger25.debug(`No valid agentId in query. Trying global match for path: ${reqPath}`);
       for (const [_, runtime] of agents) {
@@ -5929,11 +5943,12 @@ var AgentServer = class {
           }
         }
       };
+      let clientPath = null;
       if (this.isWebUIEnabled) {
         const possiblePaths = [
-          // Development: relative to server package
+          // Development: relative to server package (monorepo)
           path9.resolve(__dirname2, "../../cli/dist"),
-          // Production: using require.resolve to find CLI package
+          // Production: using require.resolve to find CLI package (if installed as dependency)
           (() => {
             try {
               return path9.resolve(
@@ -5943,19 +5958,76 @@ var AgentServer = class {
             } catch {
               return null;
             }
-          })()
+          })(),
+          // Global bun install: check global node_modules locations
+          (() => {
+            try {
+              const { execSync } = __require("child_process");
+              const bunGlobalPath = path9.join(
+                os2.homedir(),
+                ".bun/install/global/node_modules/@elizaos/cli/dist"
+              );
+              if (existsSync3(path9.join(bunGlobalPath, "index.html"))) {
+                return bunGlobalPath;
+              }
+              try {
+                const npmRoot = execSync("npm root -g", { encoding: "utf8" }).trim();
+                const globalCliPath = path9.join(npmRoot, "@elizaos/cli/dist");
+                if (existsSync3(path9.join(globalCliPath, "index.html"))) {
+                  return globalCliPath;
+                }
+              } catch {
+              }
+            } catch {
+            }
+            return null;
+          })(),
+          // Alternative global locations (common paths)
+          ...[
+            "/usr/local/lib/node_modules/@elizaos/cli/dist",
+            "/usr/lib/node_modules/@elizaos/cli/dist",
+            path9.join(os2.homedir(), ".npm-global/lib/node_modules/@elizaos/cli/dist"),
+            // Check nvm installations
+            (() => {
+              try {
+                const nvmPath = path9.join(os2.homedir(), ".nvm/versions/node");
+                if (existsSync3(nvmPath)) {
+                  const versions = fs9.readdirSync(nvmPath);
+                  for (const version of versions) {
+                    const cliPath = path9.join(
+                      nvmPath,
+                      version,
+                      "lib/node_modules/@elizaos/cli/dist"
+                    );
+                    if (existsSync3(path9.join(cliPath, "index.html"))) {
+                      return cliPath;
+                    }
+                  }
+                }
+              } catch {
+              }
+              return null;
+            })()
+          ].filter(Boolean)
         ].filter(Boolean);
-        let clientPath = null;
         for (const possiblePath of possiblePaths) {
           if (possiblePath && existsSync3(path9.join(possiblePath, "index.html"))) {
             clientPath = possiblePath;
+            logger29.info(`[STATIC] Found client files at: ${clientPath}`);
             break;
           }
         }
         if (clientPath) {
           this.app.use(express31.static(clientPath, staticOptions));
         } else {
-          logger29.warn("[STATIC] Client dist path not found");
+          logger29.warn("[STATIC] Client dist path not found. Searched locations:");
+          possiblePaths.forEach((p) => {
+            if (p) logger29.warn(`[STATIC]   - ${p}`);
+          });
+          logger29.warn("[STATIC] The web UI will not be available.");
+          logger29.warn(
+            "[STATIC] To fix this, ensure @elizaos/cli is installed globally: bun install -g @elizaos/cli"
+          );
         }
       }
       const pluginRouteHandler = createPluginRouteHandler(this.agents);
@@ -6000,31 +6072,8 @@ var AgentServer = class {
             res.setHeader("Content-Type", "application/javascript");
             return res.status(404).send(`// JavaScript module not found: ${req.path}`);
           }
-          const possiblePaths = [
-            // Development: relative to server package
-            path9.resolve(__dirname2, "../../cli/dist"),
-            // Production: using require.resolve to find CLI package
-            (() => {
-              try {
-                return path9.resolve(
-                  path9.dirname(__require.resolve("@elizaos/cli/package.json")),
-                  "dist"
-                );
-              } catch {
-                return null;
-              }
-            })()
-          ].filter((p) => p !== null);
-          let indexPath = null;
-          for (const possiblePath of possiblePaths) {
-            const testPath = path9.join(possiblePath, "index.html");
-            if (possiblePath && existsSync3(testPath)) {
-              indexPath = testPath;
-              break;
-            }
-          }
-          if (indexPath) {
-            const indexFilePath = indexPath;
+          if (clientPath) {
+            const indexFilePath = path9.join(clientPath, "index.html");
             res.sendFile(indexFilePath, (err) => {
               if (err) {
                 logger29.warn(`[STATIC] Failed to serve index.html: ${err.message}`);
@@ -6032,6 +6081,7 @@ var AgentServer = class {
               }
             });
           } else {
+            logger29.warn("[STATIC] Client dist path not found in SPA fallback");
             res.status(404).send("Client application not found");
           }
         });