@mastra/server 1.79.0-alpha.3 → 1.79.0-alpha.5

package/dist/server/handlers/agents.cjs

@@ -1,14 +1,14 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("../../rolldown-runtime-Bd6kNlEP.cjs");
 const require_http_exception = require("../../http-exception-CKDHupKw.cjs");
-const require_agents = require("../../agents-D9vpLghy.cjs");
-const require_schema_e0VHpMt0 = require("../../schema-e0VHpMt0-BS9KHnuT.cjs");
-const require_route_builder = require("../../route-builder-2yrD15TL.cjs");
-require("../../schema-BVcoNfni.cjs");
-const require_utils = require("../../utils-BZdnPmsW.cjs");
+const require_agents = require("../../agents-BgeSrhey.cjs");
+const require_schema_e0VHpMt0 = require("../../schema-e0VHpMt0-C0452jOk.cjs");
+const require_route_builder = require("../../route-builder-TBkBU65d.cjs");
+require("../../schema-EQanefYq.cjs");
+const require_utils = require("../../utils-DCgeTrq2.cjs");
 const require_constants = require("../../constants-e7aaPCLj.cjs");
 const require_server_handlers_error = require("./error.cjs");
-const require_utils$1 = require("../../utils-CczRcgHQ.cjs");
+const require_utils$1 = require("../../utils-Du-EpvDs.cjs");
 const require_stored_agents = require("../../stored-agents-BTL-o6aM.cjs");
 const require_workspace = require("../../workspace-BJYV2lkt.cjs");
 const require_server_handlers_tool_schema_overrides = require("./tool-schema-overrides.cjs");
@@ -536,6 +536,7 @@ async function formatAgentList({ id, mastra, agent, requestContext, partial = fa
 		supportsMemory,
 		defaultOptions,
 		modelList,
+		modelListEditable: modelList ? typeof agent.model !== "function" : void 0,
 		defaultGenerateOptionsLegacy,
 		defaultStreamOptionsLegacy,
 		requestContextSchema: serializedRequestContextSchema,
@@ -764,6 +765,7 @@ async function formatAgent({ mastra, agent, requestContext, isStudio }) {
 		modelVersion: model?.specificationVersion,
 		supportsMemory,
 		modelList,
+		modelListEditable: modelList ? typeof agent.model !== "function" : void 0,
 		defaultOptions,
 		defaultGenerateOptionsLegacy,
 		defaultStreamOptionsLegacy,
@@ -997,7 +999,7 @@ const GENERATE_AGENT_ROUTE = require_route_builder.createRoute({
 				authorizedMemoryOption = {
 					...memoryOption,
 					resource: effectiveResourceId ?? memoryOption.resource,
-					thread: effectiveThreadId ?? memoryOption.thread
+					thread: require_utils$1.applyEffectiveThreadId(memoryOption.thread, effectiveThreadId)
 				};
 			}
 			const { structuredOutput, ...restOptions } = rest;
@@ -1271,7 +1273,7 @@ const STREAM_GENERATE_ROUTE = require_route_builder.createRoute({
 				authorizedMemoryOption = {
 					...memoryOption,
 					resource: effectiveResourceId ?? memoryOption.resource,
-					thread: effectiveThreadId ?? memoryOption.thread
+					thread: require_utils$1.applyEffectiveThreadId(memoryOption.thread, effectiveThreadId)
 				};
 			}
 			const { structuredOutput, untilIdle, ...restOptions } = rest;
@@ -1763,7 +1765,7 @@ const STREAM_UNTIL_IDLE_GENERATE_ROUTE = require_route_builder.createRoute({
 				authorizedMemoryOption = {
 					...memoryOption,
 					resource: effectiveResourceId ?? memoryOption.resource,
-					thread: effectiveThreadId ?? memoryOption.thread
+					thread: require_utils$1.applyEffectiveThreadId(memoryOption.thread, effectiveThreadId)
 				};
 			}
 			const { structuredOutput, ...restOptions } = rest;
@@ -2135,7 +2137,7 @@ const RESUME_STREAM_ROUTE = require_route_builder.createRoute({
 			if (memoryOption || effectiveResourceId || effectiveThreadId) authorizedMemoryOption = {
 				...memoryOption,
 				...effectiveResourceId ? { resource: effectiveResourceId } : {},
-				...effectiveThreadId ? { thread: effectiveThreadId } : {}
+				...effectiveThreadId ? { thread: require_utils$1.applyEffectiveThreadId(memoryOption?.thread, effectiveThreadId) } : {}
 			};
 			await validateDurableToolCallAccess({
 				mastra,
@@ -2261,7 +2263,7 @@ const RESUME_STREAM_UNTIL_IDLE_ROUTE = require_route_builder.createRoute({
 			if (memoryOption || effectiveResourceId || effectiveThreadId) authorizedMemoryOption = {
 				...memoryOption,
 				...effectiveResourceId ? { resource: effectiveResourceId } : {},
-				...effectiveThreadId ? { thread: effectiveThreadId } : {}
+				...effectiveThreadId ? { thread: require_utils$1.applyEffectiveThreadId(memoryOption?.thread, effectiveThreadId) } : {}
 			};
 			await validateDurableToolCallAccess({
 				mastra,
@@ -2555,9 +2557,10 @@ const REORDER_AGENT_MODEL_LIST_ROUTE = require_route_builder.createRoute({
 				mastra,
 				agentId
 			});
+			if (typeof agent.model === "function") throw new require_http_exception.HTTPException(409, { message: "Agent model list is dynamic (model is a function) and cannot be edited" });
 			const modelList = await agent.getModelList();
 			if (!modelList || modelList.length === 0) throw new require_http_exception.HTTPException(400, { message: "Agent model list is not found or empty" });
-			agent.reorderModels(reorderedModelIds);
+			if (agent.reorderModels(reorderedModelIds) === false) throw new require_http_exception.HTTPException(400, { message: "Agent model list could not be reordered" });
 			return { message: "Model list reordered" };
 		} catch (error) {
 			return require_server_handlers_error.handleError(error, "error reordering model list");
@@ -2581,6 +2584,7 @@ const UPDATE_AGENT_MODEL_IN_MODEL_LIST_ROUTE = require_route_builder.createRoute
 				mastra,
 				agentId
 			});
+			if (typeof agent.model === "function") throw new require_http_exception.HTTPException(409, { message: "Agent model list is dynamic (model is a function) and cannot be edited" });
 			const modelList = await agent.getModelList();
 			if (!modelList || modelList.length === 0) throw new require_http_exception.HTTPException(400, { message: "Agent model list is not found or empty" });
 			const modelConfig = modelList.find((config) => config.id === modelConfigId);
@@ -2592,7 +2596,7 @@ const UPDATE_AGENT_MODEL_IN_MODEL_LIST_ROUTE = require_route_builder.createRoute
 				...maxRetries !== void 0 ? { maxRetries } : {},
 				...enabled !== void 0 ? { enabled } : {}
 			};
-			agent.updateModelInModelList(updated);
+			if (agent.updateModelInModelList(updated) === false) throw new require_http_exception.HTTPException(404, { message: `Model config with id ${modelConfigId} not found` });
 			return { message: "Model updated in model list" };
 		} catch (error) {
 			return require_server_handlers_error.handleError(error, "error updating model in model list");