Skip to content

SmythOS Studio: Open-Source Visual AI Agent Builder and deployable runtime stack from SmythOS. Start with an intuitive drag-and-drop workspace, extend with custom code, and deploy your agents anywhere — local, cloud, or edge — with full governance and control.

fix embodiment routes

Forhad Hosaina48ffc882b7d
diff --git a/packages/runtime/src/core/middlewares/cors.mw.ts b/packages/runtime/src/core/middlewares/cors.mw.ts
index 6b14012a..6105fe32 100644
--- a/packages/runtime/src/core/middlewares/cors.mw.ts
+++ b/packages/runtime/src/core/middlewares/cors.mw.ts
@@ -8,7 +8,7 @@ const corsOptions: cors.CorsOptions = {
: true,
credentials: true,
methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
- allowedHeaders: ["Content-Type", "Authorization"],
+ allowedHeaders: ["Content-Type", "Authorization", "X-Conversation-Id", "X-Auth-Token", "X-Parent-Cookie", "X-Monitor-Id"],
};
export default cors(corsOptions);
diff --git a/packages/runtime/src/core/router-config.ts b/packages/runtime/src/core/router-config.ts
index 096406f0..f73ada83 100644
--- a/packages/runtime/src/core/router-config.ts
+++ b/packages/runtime/src/core/router-config.ts
@@ -23,6 +23,12 @@ import agentRunnerAgentLoader from "@agent-runner/middlewares/agentLoader.mw";
import { processAgentRequest as agentRunnerProcessAgentRequest } from "@agent-runner/services/agent-request-handler";
import { uploadHandler } from "@core/middlewares/uploadHandler.mw";
+// Route imports for service-specific endpoints
+import agentRunnerOauthRouter from "@agent-runner/routes/_oauth/router";
+
+// Common route imports - available for all server configurations
+import modelsRouter from "@debugger/routes/models/router";
+
/**
* Configures and mounts agent routers based on runtime configuration
* Designed for future server extraction without code changes
@@ -54,6 +60,10 @@ export function configureAgentRouters(
routing: config.routing.strategy,
});
+ // Mount common routes that should be available in all server configurations
+ console.log("Mounting /models route (available for all server types)");
+ app.use("/models", modelsRouter);
+
// Configure based on routing strategy and enabled services
const debuggerEnabled = config.services.debugger.enabled;
const agentRunnerEnabled = config.services.agentRunner.enabled;
@@ -99,7 +109,7 @@ export function configureAgentRouters(
if (debuggerEnabled) {
console.log("Mounting debugger router");
const debuggerRouter = createDebuggerRouter(
- debuggerAgentLoader,
+ [uploadHandler, debuggerAgentLoader],
debuggerProcessAgentRequest,
{
getDebugSession: debuggerGetDebugSession,
@@ -116,6 +126,10 @@ export function configureAgentRouters(
agentRunnerProcessAgentRequest
);
app.use("/", agentRunnerRouter);
+
+ // Mount agent-runner-specific routes
+ console.log("Mounting /oauth route for agent-runner");
+ app.use("/oauth", agentRunnerOauthRouter);
}
// Note: Embodiment router will be mounted here when embodimentEnabled is true
diff --git a/packages/runtime/src/core/shared-agent-router.ts b/packages/runtime/src/core/shared-agent-router.ts
index 2d146561..122a1cfa 100644
--- a/packages/runtime/src/core/shared-agent-router.ts
+++ b/packages/runtime/src/core/shared-agent-router.ts
@@ -64,7 +64,7 @@ export function createAgentRouter(config: AgentRouterConfig): express.Router {
* Factory function to create debugger-specific router
*/
export function createDebuggerRouter(
- agentLoader: express.RequestHandler,
+ middlewares: express.RequestHandler[],
processAgentRequest: (agentId: string, req: express.Request) => Promise<any>,
additionalServices?: {
getDebugSession: (id: string) => any;
@@ -73,10 +73,12 @@ export function createDebuggerRouter(
): express.Router {
return createAgentRouter({
mode: "debugger",
- middlewares: [agentLoader],
+ middlewares,
processAgentRequest,
loggerPrefix: "[Debugger] Router: Agent",
additionalRoutes: (router) => {
+ // Additional routes are now mounted directly in router-config.ts
+
if (additionalServices) {
// Debug session route
router.get("/agent/:id/debugSession", (req, res) => {
@@ -117,5 +119,8 @@ export function createAgentRunnerRouter(
middlewares,
processAgentRequest,
loggerPrefix: "(Agent Runner) Router: Agent",
+ additionalRoutes: (router) => {
+ // Additional routes are now mounted directly in router-config.ts
+ },
});
}
diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
index ffad44a0..fca93c30 100644
--- a/packages/runtime/src/index.ts
+++ b/packages/runtime/src/index.ts
@@ -8,10 +8,11 @@ import {
} from "@smythos/sre";
import compression from "compression";
import cookieParser from "cookie-parser";
+import crypto from "crypto";
import express from "express";
+import session from "express-session";
import { Server } from "http";
import path from "path";
-import swaggerUi from "swagger-ui-express";
import url from "url";
// Core imports
@@ -28,11 +29,7 @@ import { SmythOSSAgentDataConnector } from "@core/connectors/SmythOSSAgentDataCo
import { SmythOSSManagedVault } from "@core/connectors/SmythOSSManagedVault.class";
import { SmythOSSVault } from "@core/connectors/SmythOSSVault.class";
-// Debugger Imports
-import modelsRouter from "@debugger/routes/models/router";
-
-// Agent-runner imports
-import oauthRouter from "@agent-runner/routes/_oauth/router";
+// Routes are handled by configureAgentRouters
// Shared router configuration
import {
@@ -329,6 +326,12 @@ const __dirname = path.dirname(__filename);
const console = Logger("runtime-server");
+// Helper function for session ID generation
+function getCurrentFormattedDate() {
+ const now = new Date();
+ return now.toISOString().slice(0, 10).replace(/-/g, "");
+}
+
app.disable("x-powered-by");
app.set("trust proxy", 1);
@@ -350,6 +353,33 @@ app.use((req, res, next) => {
});
app.use(cookieParser());
+
+// Session middleware for chatbot functionality
+app.use(
+ session({
+ name: "smythos_runtime_session",
+ secret: process.env.SESSION_SECRET || "default-session-secret-for-dev",
+ cookie: {
+ maxAge: 1 * 24 * 60 * 60 * 1000, // 1 day
+ sameSite: config.env.NODE_ENV === "development" ? "lax" : "none",
+ secure: config.env.NODE_ENV !== "development",
+ },
+ resave: false,
+ saveUninitialized: true,
+ genid: (req) => {
+ if (req.sessionID && req.session) {
+ return req.sessionID;
+ }
+ const domain = req.hostname;
+ const isTestDomain = domain.includes(`.${config.env.AGENT_DOMAIN}`);
+ const prefix = isTestDomain ? "test-" : "";
+ const formattedDate = getCurrentFormattedDate();
+ const randomString = crypto.randomBytes(8).toString("hex");
+ return `${prefix}${formattedDate}-${randomString}`;
+ },
+ })
+);
+
app.use(uploadHandler);
app.use(RateLimiter);
app.use(express.json({ limit: "10mb" }));
@@ -382,10 +412,6 @@ configureAgentRouters(app, createCombinedServerConfig());
app.use("/", embodimentRoutes);
-app.use("/models", modelsRouter);
-app.use("/oauth", oauthRouter);
-app.use("/swagger", swaggerUi.serve);
-
// 404 handler - must come before error handler
app.use(notFoundHandler);
diff --git a/packages/runtime/src/modules/debugger/routes/agent/routes.ts b/packages/runtime/src/modules/debugger/routes/agent/routes.ts
index f132c734..a695569c 100644
--- a/packages/runtime/src/modules/debugger/routes/agent/routes.ts
+++ b/packages/runtime/src/modules/debugger/routes/agent/routes.ts
@@ -1,3 +1,4 @@
+import { uploadHandler } from "@core/middlewares/uploadHandler.mw";
import { createDebuggerRouter } from "@core/shared-agent-router";
import agentLoader from "@debugger/middlewares/agentLoader.mw";
import {
@@ -6,7 +7,10 @@ import {
processAgentRequest,
} from "@debugger/services/agent-request-handler";
-const router = createDebuggerRouter(agentLoader, processAgentRequest, {
+/* uploadHandler should precede agentLoader to parse multipart/form-data correctly */
+const middlewares = [uploadHandler, agentLoader];
+
+const router = createDebuggerRouter(middlewares, processAgentRequest, {
getDebugSession,
createSseConnection,
});
diff --git a/packages/runtime/src/modules/debugger/routes/models/router.ts b/packages/runtime/src/modules/debugger/routes/models/router.ts
index 4be2ecec..aad240fd 100644
--- a/packages/runtime/src/modules/debugger/routes/models/router.ts
+++ b/packages/runtime/src/modules/debugger/routes/models/router.ts
@@ -7,7 +7,7 @@ import {
} from "@smythos/sre";
import { createHash } from "crypto";
-const console = Logger("[Debugger] Router: Models");
+const console = Logger("[Builder] Router: Models");
const router = express.Router();
// Constants
diff --git a/packages/runtime/src/modules/embodiment/routes/index.ts b/packages/runtime/src/modules/embodiment/routes/index.ts
index 8611d6fa..b11fa345 100644
--- a/packages/runtime/src/modules/embodiment/routes/index.ts
+++ b/packages/runtime/src/modules/embodiment/routes/index.ts
@@ -1,3 +1,7 @@
+import { Router } from "express";
+
+import swaggerUi from "swagger-ui-express";
+
import config from "@core/config";
import { agentChatRouter } from "@embodiment/modules/agentChat/routes/router";
import { alexaRouter } from "@embodiment/modules/alexa/routes/router";
@@ -9,7 +13,6 @@ import { mcpRouter } from "@embodiment/modules/mcp/routes/router";
import { openaiRouter } from "@embodiment/modules/openai/routes";
import { postmanRouter } from "@embodiment/modules/postman/routes/router";
import { swaggerRouter } from "@embodiment/modules/swagger/routes/router";
-import { Router } from "express";
const mainRouter = Router();
@@ -30,11 +33,16 @@ const defaultRoutes: Route[] = [
route: postmanRouter,
},
+ // #region Swagger, we need both
+ {
+ rootPath: ["/swagger", "/emb/swagger"],
+ route: swaggerUi.serve,
+ },
{
- // match /swagger and /swagger/
rootPath: ["/swagger", "/emb/swagger"],
route: swaggerRouter,
},
+ // #endregion
{
rootPath: ["/", "/emb/api"],
@@ -45,7 +53,7 @@ const defaultRoutes: Route[] = [
route: chatGPTRouter,
},
{
- rootPath: ["/chatbot", "/emb/chatbot"],
+ rootPath: ["/chatbot", "chatBot", "/emb/chatbot"],
route: chatBotRouter,
},
{
diff --git a/packages/runtime/src/modules/embodiment/services/Chatbot.class.ts b/packages/runtime/src/modules/embodiment/services/Chatbot.class.ts
index 8e1a793e..283c0eb9 100644
--- a/packages/runtime/src/modules/embodiment/services/Chatbot.class.ts
+++ b/packages/runtime/src/modules/embodiment/services/Chatbot.class.ts
@@ -86,34 +86,16 @@ export default class Chatbot {
) ||
this.model;
- // ! DEPRECATED: LLMRegistry and CustomLLMRegistry is not available anymore, if we need to set the maxOutputTokens then we need to find out a different way to do it
- // const isStandardLLM = LLMRegistry.isStandardLLM(this.model);
- // const team = AccessCandidate.team(this.teamId);
- // let llmRegistry = isStandardLLM ? LLMRegistry : await CustomLLMRegistry.getInstance(team);
-
- // if (typeof llmRegistry?.getModelInfo !== 'function') {
- // const error = new Error(`The chatbot model '${this.model}' is not supported.`);
- // error['errKey'] = 'MODEL_NOT_SUPPORTED';
- // throw error;
- // }
-
- // this.modelInfo = await llmRegistry.getModelInfo(this.model);
-
- // if (this.modelInfo.tokens == this.modelInfo.completionTokens) {
- // this.contextWindow = Math.round(this.modelInfo.tokens * 0.5);
- // this.maxOutputTokens = Math.round(this.modelInfo.tokens * 0.5);
- // } else if (this.modelInfo.tokens > this.modelInfo.completionTokens) {
- // this.contextWindow = this.modelInfo.tokens - this.modelInfo.completionTokens;
- // this.maxOutputTokens = this.modelInfo.completionTokens;
- // } else {
- // this.contextWindow = this.modelInfo.tokens;
- // this.maxOutputTokens = this.modelInfo.completionTokens;
- // }
-
- // this.maxOutputTokens = Math.min(this.maxOutputTokens, 8192); //limit the max output tokens to 8192
-
- //tokens limits are now handled by SRE
- this.model = this.modelInfo.modelId;
+ // Initialize basic modelInfo since LLMRegistry is deprecated
+ // SRE will handle the actual token limits and model validation
+ this.modelInfo = {
+ modelId: this.model,
+ tokens: this.contextWindow,
+ completionTokens: this.maxOutputTokens
+ };
+
+ // Keep original model ID
+ // this.model stays as is since SRE handles model resolution
console.log("modelInfo", this.model, this.modelInfo);
}