@elizaos/server 1.1.2 → 1.1.4

package/dist/index.js

@@ -4,7 +4,13 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function __require() {
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+var __commonJS = (cb, mod) => function __require2() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __copyProps = (to, from, except, desc) => {
@@ -3810,7 +3816,7 @@ import express28 from "express";
 // package.json
 var package_default = {
   name: "@elizaos/server",
-  version: "1.1.2",
+  version: "1.1.4",
   description: "ElizaOS Server - Core server infrastructure for ElizaOS agents",
   publishConfig: {
     access: "public",
@@ -3862,10 +3868,10 @@ var package_default = {
     which: "^4.0.0",
     ws: "^8.18.0"
   },
-  gitHead: "fc0714c773d1bb917ffafab7ad8db6eab116d642",
+  gitHead: "06db8f7642156822f010efef3377af4c6161f2c8",
   dependencies: {
-    "@elizaos/core": "1.1.2",
-    "@elizaos/plugin-sql": "1.1.2",
+    "@elizaos/core": "1.1.4",
+    "@elizaos/plugin-sql": "1.1.4",
     "@types/express": "^5.0.2",
     "@types/helmet": "^4.0.0",
     "@types/multer": "^1.4.13",
@@ -4387,6 +4393,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");
@@ -4488,25 +4499,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) {
@@ -5924,8 +5943,33 @@ var AgentServer = class {
         }
       };
       if (this.isWebUIEnabled) {
-        const clientPath = path9.resolve(__dirname2, "../../cli/dist");
-        this.app.use(express31.static(clientPath, staticOptions));
+        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(Boolean);
+        let clientPath = null;
+        for (const possiblePath of possiblePaths) {
+          if (possiblePath && existsSync3(path9.join(possiblePath, "index.html"))) {
+            clientPath = possiblePath;
+            break;
+          }
+        }
+        if (clientPath) {
+          this.app.use(express31.static(clientPath, staticOptions));
+        } else {
+          logger29.warn("[STATIC] Client dist path not found");
+        }
       }
       const pluginRouteHandler = createPluginRouteHandler(this.agents);
       this.app.use(pluginRouteHandler);
@@ -5969,13 +6013,40 @@ var AgentServer = class {
             res.setHeader("Content-Type", "application/javascript");
             return res.status(404).send(`// JavaScript module not found: ${req.path}`);
           }
-          const cliDistPath = path9.resolve(__dirname2, "../../cli/dist");
-          res.sendFile(path9.join(cliDistPath, "index.html"), (err) => {
-            if (err) {
-              logger29.warn(`[STATIC] Failed to serve index.html: ${err.message}`);
-              res.status(404).send("Client application not found");
+          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;
+            res.sendFile(indexFilePath, (err) => {
+              if (err) {
+                logger29.warn(`[STATIC] Failed to serve index.html: ${err.message}`);
+                res.status(404).send("Client application not found");
+              }
+            });
+          } else {
+            res.status(404).send("Client application not found");
+          }
         });
       } else {
         this.app.use((_req, res) => {