@mastra/server 1.58.0-alpha.4 → 1.58.0-alpha.5

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @mastra/server
 
+## 1.58.0-alpha.5
+
+### Minor Changes
+
+- Renamed the stored workflows handlers and schemas to dynamic workflows. HTTP route paths and permissions are unchanged. ([#20938](https://github.com/mastra-ai/mastra/pull/20938))
+
+### Patch Changes
+
+- Updated dependencies [[`6445eba`](https://github.com/mastra-ai/mastra/commit/6445eba6020abac681aba1cc9289f446cb400cbe), [`df31eb0`](https://github.com/mastra-ai/mastra/commit/df31eb0c7087d782a0d9346e467f9a4af4b0eef6), [`fcd0667`](https://github.com/mastra-ai/mastra/commit/fcd0667a4e378be35c9a1b1eb19cce78fbfd7282), [`bab06b1`](https://github.com/mastra-ai/mastra/commit/bab06b18923873a584bdfc71a6b4ec7fb4727fb7)]:
+  - @mastra/core@1.58.0-alpha.5
+
 ## 1.58.0-alpha.4
 
 ### Minor Changes

package/dist/{agent-builder-DAiJH1u2.cjs → agent-builder-Bq8VQxPt.cjs}

@@ -1,4 +1,4 @@
-const require_workflows = require("./workflows-Dzxr6cmf.cjs");
+const require_workflows = require("./workflows-BPDvo87u.cjs");
 let zod_v4 = require("zod/v4");
 //#region src/server/schemas/agent-builder.ts
 const actionIdPathParams = zod_v4.z.object({ actionId: zod_v4.z.string().describe("Unique identifier for the agent-builder action") });
@@ -64,4 +64,4 @@ Object.defineProperty(exports, "streamLegacyAgentBuilderBodySchema", {
 	}
 });
 
-//# sourceMappingURL=agent-builder-DAiJH1u2.cjs.map
+//# sourceMappingURL=agent-builder-Bq8VQxPt.cjs.map

package/dist/{agent-builder-DAiJH1u2.cjs.map → agent-builder-Bq8VQxPt.cjs.map}

@@ -1 +1 @@
-{"version":3,"file":"agent-builder-DAiJH1u2.cjs","names":["z","streamWorkflowBodySchema","streamLegacyWorkflowBodySchema","resumeBodySchema","startAsyncWorkflowBodySchema"],"sources":["../src/server/schemas/agent-builder.ts"],"sourcesContent":["import { z } from 'zod/v4';\nimport {\n  streamWorkflowBodySchema,\n  resumeBodySchema,\n  startAsyncWorkflowBodySchema,\n  streamLegacyWorkflowBodySchema,\n} from './workflows';\n\n// Path parameter schemas\n\nexport const actionIdPathParams = z.object({\n  actionId: z.string().describe('Unique identifier for the agent-builder action'),\n});\n\nexport const actionRunPathParams = z.object({\n  actionId: z.string().describe('Unique identifier for the agent-builder action'),\n  runId: z.string().describe('Unique identifier for the action run'),\n});\n\n/**\n * Agent-builder schemas use the same body schemas as workflows\n * Both use requestContext field\n */\n\n/**\n * Schema for stream agent-builder action body\n */\nexport const streamAgentBuilderBodySchema = streamWorkflowBodySchema;\n\n/**\n * Schema for legacy stream agent-builder action body\n */\nexport const streamLegacyAgentBuilderBodySchema = streamLegacyWorkflowBodySchema;\n\n/**\n * Schema for resume agent-builder action body\n */\nexport const resumeAgentBuilderBodySchema = resumeBodySchema;\n\n/**\n * Schema for start async agent-builder action body\n */\nexport const startAsyncAgentBuilderBodySchema = startAsyncWorkflowBodySchema;\n\n// Agent-builder actions use the same response schemas as workflows since they're wrapped workflow handlers\nexport {\n  createWorkflowRunResponseSchema,\n  listWorkflowRunsQuerySchema,\n  sendWorkflowRunEventBodySchema,\n  workflowExecutionResultSchema,\n  workflowControlResponseSchema,\n  workflowRunsResponseSchema,\n  workflowInfoSchema,\n  listWorkflowsResponseSchema,\n  workflowRunResultSchema,\n  workflowRunResultQuerySchema,\n} from './workflows';\n"],"mappings":";;;AAUA,MAAa,qBAAqBA,OAAAA,EAAE,OAAO,EACzC,UAAUA,OAAAA,EAAE,OAAO,CAAC,CAAC,SAAS,gDAAgD,EAChF,CAAC;AAED,MAAa,sBAAsBA,OAAAA,EAAE,OAAO;CAC1C,UAAUA,OAAAA,EAAE,OAAO,CAAC,CAAC,SAAS,gDAAgD;CAC9E,OAAOA,OAAAA,EAAE,OAAO,CAAC,CAAC,SAAS,sCAAsC;AACnE,CAAC;;;;;;;;AAUD,MAAa,+BAA+BC,kBAAAA;;;;AAK5C,MAAa,qCAAqCC,kBAAAA;;;;AAKlD,MAAa,+BAA+BC,kBAAAA;;;;AAK5C,MAAa,mCAAmCC,kBAAAA"}
+{"version":3,"file":"agent-builder-Bq8VQxPt.cjs","names":["z","streamWorkflowBodySchema","streamLegacyWorkflowBodySchema","resumeBodySchema","startAsyncWorkflowBodySchema"],"sources":["../src/server/schemas/agent-builder.ts"],"sourcesContent":["import { z } from 'zod/v4';\nimport {\n  streamWorkflowBodySchema,\n  resumeBodySchema,\n  startAsyncWorkflowBodySchema,\n  streamLegacyWorkflowBodySchema,\n} from './workflows';\n\n// Path parameter schemas\n\nexport const actionIdPathParams = z.object({\n  actionId: z.string().describe('Unique identifier for the agent-builder action'),\n});\n\nexport const actionRunPathParams = z.object({\n  actionId: z.string().describe('Unique identifier for the agent-builder action'),\n  runId: z.string().describe('Unique identifier for the action run'),\n});\n\n/**\n * Agent-builder schemas use the same body schemas as workflows\n * Both use requestContext field\n */\n\n/**\n * Schema for stream agent-builder action body\n */\nexport const streamAgentBuilderBodySchema = streamWorkflowBodySchema;\n\n/**\n * Schema for legacy stream agent-builder action body\n */\nexport const streamLegacyAgentBuilderBodySchema = streamLegacyWorkflowBodySchema;\n\n/**\n * Schema for resume agent-builder action body\n */\nexport const resumeAgentBuilderBodySchema = resumeBodySchema;\n\n/**\n * Schema for start async agent-builder action body\n */\nexport const startAsyncAgentBuilderBodySchema = startAsyncWorkflowBodySchema;\n\n// Agent-builder actions use the same response schemas as workflows since they're wrapped workflow handlers\nexport {\n  createWorkflowRunResponseSchema,\n  listWorkflowRunsQuerySchema,\n  sendWorkflowRunEventBodySchema,\n  workflowExecutionResultSchema,\n  workflowControlResponseSchema,\n  workflowRunsResponseSchema,\n  workflowInfoSchema,\n  listWorkflowsResponseSchema,\n  workflowRunResultSchema,\n  workflowRunResultQuerySchema,\n} from './workflows';\n"],"mappings":";;;AAUA,MAAa,qBAAqBA,OAAAA,EAAE,OAAO,EACzC,UAAUA,OAAAA,EAAE,OAAO,CAAC,CAAC,SAAS,gDAAgD,EAChF,CAAC;AAED,MAAa,sBAAsBA,OAAAA,EAAE,OAAO;CAC1C,UAAUA,OAAAA,EAAE,OAAO,CAAC,CAAC,SAAS,gDAAgD;CAC9E,OAAOA,OAAAA,EAAE,OAAO,CAAC,CAAC,SAAS,sCAAsC;AACnE,CAAC;;;;;;;;AAUD,MAAa,+BAA+BC,kBAAAA;;;;AAK5C,MAAa,qCAAqCC,kBAAAA;;;;AAKlD,MAAa,+BAA+BC,kBAAAA;;;;AAK5C,MAAa,mCAAmCC,kBAAAA"}

package/dist/{agent-builder-gGFywDVq.js → agent-builder-DVv4fSab.js}

@@ -1,4 +1,4 @@
-import { d as streamWorkflowBodySchema, l as startAsyncWorkflowBodySchema, s as resumeBodySchema, u as streamLegacyWorkflowBodySchema } from "./workflows-CMU5dz_4.js";
+import { d as streamWorkflowBodySchema, l as startAsyncWorkflowBodySchema, s as resumeBodySchema, u as streamLegacyWorkflowBodySchema } from "./workflows-Dzl1i83M.js";
 import { z } from "zod/v4";
 //#region src/server/schemas/agent-builder.ts
 const actionIdPathParams = z.object({ actionId: z.string().describe("Unique identifier for the agent-builder action") });
@@ -29,4 +29,4 @@ const startAsyncAgentBuilderBodySchema = startAsyncWorkflowBodySchema;
 //#endregion
 export { streamAgentBuilderBodySchema as a, startAsyncAgentBuilderBodySchema as i, actionRunPathParams as n, streamLegacyAgentBuilderBodySchema as o, resumeAgentBuilderBodySchema as r, actionIdPathParams as t };
 
-//# sourceMappingURL=agent-builder-gGFywDVq.js.map
+//# sourceMappingURL=agent-builder-DVv4fSab.js.map

package/dist/{agent-builder-gGFywDVq.js.map → agent-builder-DVv4fSab.js.map}

@@ -1 +1 @@
-{"version":3,"file":"agent-builder-gGFywDVq.js","names":[],"sources":["../src/server/schemas/agent-builder.ts"],"sourcesContent":["import { z } from 'zod/v4';\nimport {\n  streamWorkflowBodySchema,\n  resumeBodySchema,\n  startAsyncWorkflowBodySchema,\n  streamLegacyWorkflowBodySchema,\n} from './workflows';\n\n// Path parameter schemas\n\nexport const actionIdPathParams = z.object({\n  actionId: z.string().describe('Unique identifier for the agent-builder action'),\n});\n\nexport const actionRunPathParams = z.object({\n  actionId: z.string().describe('Unique identifier for the agent-builder action'),\n  runId: z.string().describe('Unique identifier for the action run'),\n});\n\n/**\n * Agent-builder schemas use the same body schemas as workflows\n * Both use requestContext field\n */\n\n/**\n * Schema for stream agent-builder action body\n */\nexport const streamAgentBuilderBodySchema = streamWorkflowBodySchema;\n\n/**\n * Schema for legacy stream agent-builder action body\n */\nexport const streamLegacyAgentBuilderBodySchema = streamLegacyWorkflowBodySchema;\n\n/**\n * Schema for resume agent-builder action body\n */\nexport const resumeAgentBuilderBodySchema = resumeBodySchema;\n\n/**\n * Schema for start async agent-builder action body\n */\nexport const startAsyncAgentBuilderBodySchema = startAsyncWorkflowBodySchema;\n\n// Agent-builder actions use the same response schemas as workflows since they're wrapped workflow handlers\nexport {\n  createWorkflowRunResponseSchema,\n  listWorkflowRunsQuerySchema,\n  sendWorkflowRunEventBodySchema,\n  workflowExecutionResultSchema,\n  workflowControlResponseSchema,\n  workflowRunsResponseSchema,\n  workflowInfoSchema,\n  listWorkflowsResponseSchema,\n  workflowRunResultSchema,\n  workflowRunResultQuerySchema,\n} from './workflows';\n"],"mappings":";;;AAUA,MAAa,qBAAqB,EAAE,OAAO,EACzC,UAAU,EAAE,OAAO,CAAC,CAAC,SAAS,gDAAgD,EAChF,CAAC;AAED,MAAa,sBAAsB,EAAE,OAAO;CAC1C,UAAU,EAAE,OAAO,CAAC,CAAC,SAAS,gDAAgD;CAC9E,OAAO,EAAE,OAAO,CAAC,CAAC,SAAS,sCAAsC;AACnE,CAAC;;;;;;;;AAUD,MAAa,+BAA+B;;;;AAK5C,MAAa,qCAAqC;;;;AAKlD,MAAa,+BAA+B;;;;AAK5C,MAAa,mCAAmC"}
+{"version":3,"file":"agent-builder-DVv4fSab.js","names":[],"sources":["../src/server/schemas/agent-builder.ts"],"sourcesContent":["import { z } from 'zod/v4';\nimport {\n  streamWorkflowBodySchema,\n  resumeBodySchema,\n  startAsyncWorkflowBodySchema,\n  streamLegacyWorkflowBodySchema,\n} from './workflows';\n\n// Path parameter schemas\n\nexport const actionIdPathParams = z.object({\n  actionId: z.string().describe('Unique identifier for the agent-builder action'),\n});\n\nexport const actionRunPathParams = z.object({\n  actionId: z.string().describe('Unique identifier for the agent-builder action'),\n  runId: z.string().describe('Unique identifier for the action run'),\n});\n\n/**\n * Agent-builder schemas use the same body schemas as workflows\n * Both use requestContext field\n */\n\n/**\n * Schema for stream agent-builder action body\n */\nexport const streamAgentBuilderBodySchema = streamWorkflowBodySchema;\n\n/**\n * Schema for legacy stream agent-builder action body\n */\nexport const streamLegacyAgentBuilderBodySchema = streamLegacyWorkflowBodySchema;\n\n/**\n * Schema for resume agent-builder action body\n */\nexport const resumeAgentBuilderBodySchema = resumeBodySchema;\n\n/**\n * Schema for start async agent-builder action body\n */\nexport const startAsyncAgentBuilderBodySchema = startAsyncWorkflowBodySchema;\n\n// Agent-builder actions use the same response schemas as workflows since they're wrapped workflow handlers\nexport {\n  createWorkflowRunResponseSchema,\n  listWorkflowRunsQuerySchema,\n  sendWorkflowRunEventBodySchema,\n  workflowExecutionResultSchema,\n  workflowControlResponseSchema,\n  workflowRunsResponseSchema,\n  workflowInfoSchema,\n  listWorkflowsResponseSchema,\n  workflowRunResultSchema,\n  workflowRunResultQuerySchema,\n} from './workflows';\n"],"mappings":";;;AAUA,MAAa,qBAAqB,EAAE,OAAO,EACzC,UAAU,EAAE,OAAO,CAAC,CAAC,SAAS,gDAAgD,EAChF,CAAC;AAED,MAAa,sBAAsB,EAAE,OAAO;CAC1C,UAAU,EAAE,OAAO,CAAC,CAAC,SAAS,gDAAgD;CAC9E,OAAO,EAAE,OAAO,CAAC,CAAC,SAAS,sCAAsC;AACnE,CAAC;;;;;;;;AAUD,MAAa,+BAA+B;;;;AAK5C,MAAa,qCAAqC;;;;AAKlD,MAAa,+BAA+B;;;;AAK5C,MAAa,mCAAmC"}

package/dist/{api-schema-manifest-B4J_QYOr.js → api-schema-manifest-CtRYAXKX.js}

@@ -1,5 +1,5 @@
 import { c as schemaToJsonSchema } from "./route-builder-CIk5k35M.js";
-import { t as SERVER_ROUTES } from "./routes-HUaCyUb7.js";
+import { t as SERVER_ROUTES } from "./routes-cMGFe7yS.js";
 //#region src/server/server-adapter/api-schema-manifest.ts
 function convertSchema(schema) {
 	return schema ? schemaToJsonSchema(schema) : void 0;
@@ -52,4 +52,4 @@ function buildApiSchemaManifest(routes = SERVER_ROUTES) {
 //#endregion
 export { buildApiSchemaManifest };
 
-//# sourceMappingURL=api-schema-manifest-B4J_QYOr.js.map
+//# sourceMappingURL=api-schema-manifest-CtRYAXKX.js.map

package/dist/{api-schema-manifest-B4J_QYOr.js.map → api-schema-manifest-CtRYAXKX.js.map}

@@ -1 +1 @@
-{"version":3,"file":"api-schema-manifest-B4J_QYOr.js","names":[],"sources":["../src/server/server-adapter/api-schema-manifest.ts"],"sourcesContent":["import type { JSONSchema7 } from '@mastra/schema-compat';\nimport { schemaToJsonSchema } from './openapi-utils';\nimport { SERVER_ROUTES } from './routes/index';\nimport type { ServerRoute } from './routes/index';\n\nexport interface ApiSchemaResponseShape {\n  kind: 'array' | 'record' | 'object-property' | 'single' | 'unknown';\n  listProperty?: string;\n  paginationProperty?: string;\n}\n\nexport interface ApiSchemaManifestRoute {\n  method: string;\n  path: string;\n  responseType: string;\n  pathParamSchema?: JSONSchema7;\n  queryParamSchema?: JSONSchema7;\n  bodySchema?: JSONSchema7;\n  responseSchema?: JSONSchema7;\n  responseShape: ApiSchemaResponseShape;\n}\n\nexport interface ApiSchemaManifest {\n  version: 1;\n  routes: ApiSchemaManifestRoute[];\n}\n\nfunction convertSchema(schema: ServerRoute['bodySchema']): JSONSchema7 | undefined {\n  return schema ? schemaToJsonSchema(schema) : undefined;\n}\n\nfunction asJsonSchema(value: unknown): JSONSchema7 | undefined {\n  return value && typeof value === 'object' && !Array.isArray(value) ? (value as JSONSchema7) : undefined;\n}\n\nfunction schemaType(schema: JSONSchema7 | undefined): JSONSchema7['type'] | undefined {\n  const type = schema?.type;\n  return Array.isArray(type) ? type.find(Boolean) : type;\n}\n\nfunction inferResponseShape(responseSchema: JSONSchema7 | undefined): ApiSchemaResponseShape {\n  if (!responseSchema) return { kind: 'unknown' };\n\n  const type = schemaType(responseSchema);\n  if (type === 'array') return { kind: 'array' };\n  if (type !== 'object') return { kind: 'single' };\n\n  const properties =\n    responseSchema.properties && !Array.isArray(responseSchema.properties) ? responseSchema.properties : {};\n  const propertyNames = Object.keys(properties);\n  const paginationProperty = 'page' in properties ? 'page' : 'pagination' in properties ? 'pagination' : undefined;\n  const listProperty = Object.entries(properties).find(\n    ([, property]) => schemaType(asJsonSchema(property)) === 'array',\n  )?.[0];\n\n  if (listProperty && (paginationProperty || propertyNames.length <= 2)) {\n    return { kind: 'object-property', listProperty, paginationProperty };\n  }\n  if (responseSchema.additionalProperties && propertyNames.length === 0) return { kind: 'record' };\n  return { kind: 'single' };\n}\n\nfunction isManifestRoute(route: ServerRoute): boolean {\n  return route.responseType === 'json' && !route.deprecated;\n}\n\nexport function buildApiSchemaManifest(routes: readonly ServerRoute[] = SERVER_ROUTES): ApiSchemaManifest {\n  return {\n    version: 1,\n    routes: routes.filter(isManifestRoute).map(route => {\n      const responseSchema = convertSchema(route.responseSchema);\n      return {\n        method: route.method,\n        path: route.path,\n        responseType: route.responseType,\n        pathParamSchema: convertSchema(route.pathParamSchema),\n        queryParamSchema: convertSchema(route.queryParamSchema),\n        bodySchema: convertSchema(route.bodySchema),\n        responseSchema,\n        responseShape: inferResponseShape(responseSchema),\n      };\n    }),\n  };\n}\n"],"mappings":";;;AA2BA,SAAS,cAAc,QAA4D;CACjF,OAAO,SAAS,mBAAmB,MAAM,IAAI,KAAA;AAC/C;AAEA,SAAS,aAAa,OAAyC;CAC7D,OAAO,SAAS,OAAO,UAAU,YAAY,CAAC,MAAM,QAAQ,KAAK,IAAK,QAAwB,KAAA;AAChG;AAEA,SAAS,WAAW,QAAkE;CACpF,MAAM,OAAO,QAAQ;CACrB,OAAO,MAAM,QAAQ,IAAI,IAAI,KAAK,KAAK,OAAO,IAAI;AACpD;AAEA,SAAS,mBAAmB,gBAAiE;CAC3F,IAAI,CAAC,gBAAgB,OAAO,EAAE,MAAM,UAAU;CAE9C,MAAM,OAAO,WAAW,cAAc;CACtC,IAAI,SAAS,SAAS,OAAO,EAAE,MAAM,QAAQ;CAC7C,IAAI,SAAS,UAAU,OAAO,EAAE,MAAM,SAAS;CAE/C,MAAM,aACJ,eAAe,cAAc,CAAC,MAAM,QAAQ,eAAe,UAAU,IAAI,eAAe,aAAa,CAAC;CACxG,MAAM,gBAAgB,OAAO,KAAK,UAAU;CAC5C,MAAM,qBAAqB,UAAU,aAAa,SAAS,gBAAgB,aAAa,eAAe,KAAA;CACvG,MAAM,eAAe,OAAO,QAAQ,UAAU,CAAC,CAAC,MAC7C,GAAG,cAAc,WAAW,aAAa,QAAQ,CAAC,MAAM,OAC3D,CAAC,GAAG;CAEJ,IAAI,iBAAiB,sBAAsB,cAAc,UAAU,IACjE,OAAO;EAAE,MAAM;EAAmB;EAAc;CAAmB;CAErE,IAAI,eAAe,wBAAwB,cAAc,WAAW,GAAG,OAAO,EAAE,MAAM,SAAS;CAC/F,OAAO,EAAE,MAAM,SAAS;AAC1B;AAEA,SAAS,gBAAgB,OAA6B;CACpD,OAAO,MAAM,iBAAiB,UAAU,CAAC,MAAM;AACjD;AAEA,SAAgB,uBAAuB,SAAiC,eAAkC;CACxG,OAAO;EACL,SAAS;EACT,QAAQ,OAAO,OAAO,eAAe,CAAC,CAAC,KAAI,UAAS;GAClD,MAAM,iBAAiB,cAAc,MAAM,cAAc;GACzD,OAAO;IACL,QAAQ,MAAM;IACd,MAAM,MAAM;IACZ,cAAc,MAAM;IACpB,iBAAiB,cAAc,MAAM,eAAe;IACpD,kBAAkB,cAAc,MAAM,gBAAgB;IACtD,YAAY,cAAc,MAAM,UAAU;IAC1C;IACA,eAAe,mBAAmB,cAAc;GAClD;EACF,CAAC;CACH;AACF"}
+{"version":3,"file":"api-schema-manifest-CtRYAXKX.js","names":[],"sources":["../src/server/server-adapter/api-schema-manifest.ts"],"sourcesContent":["import type { JSONSchema7 } from '@mastra/schema-compat';\nimport { schemaToJsonSchema } from './openapi-utils';\nimport { SERVER_ROUTES } from './routes/index';\nimport type { ServerRoute } from './routes/index';\n\nexport interface ApiSchemaResponseShape {\n  kind: 'array' | 'record' | 'object-property' | 'single' | 'unknown';\n  listProperty?: string;\n  paginationProperty?: string;\n}\n\nexport interface ApiSchemaManifestRoute {\n  method: string;\n  path: string;\n  responseType: string;\n  pathParamSchema?: JSONSchema7;\n  queryParamSchema?: JSONSchema7;\n  bodySchema?: JSONSchema7;\n  responseSchema?: JSONSchema7;\n  responseShape: ApiSchemaResponseShape;\n}\n\nexport interface ApiSchemaManifest {\n  version: 1;\n  routes: ApiSchemaManifestRoute[];\n}\n\nfunction convertSchema(schema: ServerRoute['bodySchema']): JSONSchema7 | undefined {\n  return schema ? schemaToJsonSchema(schema) : undefined;\n}\n\nfunction asJsonSchema(value: unknown): JSONSchema7 | undefined {\n  return value && typeof value === 'object' && !Array.isArray(value) ? (value as JSONSchema7) : undefined;\n}\n\nfunction schemaType(schema: JSONSchema7 | undefined): JSONSchema7['type'] | undefined {\n  const type = schema?.type;\n  return Array.isArray(type) ? type.find(Boolean) : type;\n}\n\nfunction inferResponseShape(responseSchema: JSONSchema7 | undefined): ApiSchemaResponseShape {\n  if (!responseSchema) return { kind: 'unknown' };\n\n  const type = schemaType(responseSchema);\n  if (type === 'array') return { kind: 'array' };\n  if (type !== 'object') return { kind: 'single' };\n\n  const properties =\n    responseSchema.properties && !Array.isArray(responseSchema.properties) ? responseSchema.properties : {};\n  const propertyNames = Object.keys(properties);\n  const paginationProperty = 'page' in properties ? 'page' : 'pagination' in properties ? 'pagination' : undefined;\n  const listProperty = Object.entries(properties).find(\n    ([, property]) => schemaType(asJsonSchema(property)) === 'array',\n  )?.[0];\n\n  if (listProperty && (paginationProperty || propertyNames.length <= 2)) {\n    return { kind: 'object-property', listProperty, paginationProperty };\n  }\n  if (responseSchema.additionalProperties && propertyNames.length === 0) return { kind: 'record' };\n  return { kind: 'single' };\n}\n\nfunction isManifestRoute(route: ServerRoute): boolean {\n  return route.responseType === 'json' && !route.deprecated;\n}\n\nexport function buildApiSchemaManifest(routes: readonly ServerRoute[] = SERVER_ROUTES): ApiSchemaManifest {\n  return {\n    version: 1,\n    routes: routes.filter(isManifestRoute).map(route => {\n      const responseSchema = convertSchema(route.responseSchema);\n      return {\n        method: route.method,\n        path: route.path,\n        responseType: route.responseType,\n        pathParamSchema: convertSchema(route.pathParamSchema),\n        queryParamSchema: convertSchema(route.queryParamSchema),\n        bodySchema: convertSchema(route.bodySchema),\n        responseSchema,\n        responseShape: inferResponseShape(responseSchema),\n      };\n    }),\n  };\n}\n"],"mappings":";;;AA2BA,SAAS,cAAc,QAA4D;CACjF,OAAO,SAAS,mBAAmB,MAAM,IAAI,KAAA;AAC/C;AAEA,SAAS,aAAa,OAAyC;CAC7D,OAAO,SAAS,OAAO,UAAU,YAAY,CAAC,MAAM,QAAQ,KAAK,IAAK,QAAwB,KAAA;AAChG;AAEA,SAAS,WAAW,QAAkE;CACpF,MAAM,OAAO,QAAQ;CACrB,OAAO,MAAM,QAAQ,IAAI,IAAI,KAAK,KAAK,OAAO,IAAI;AACpD;AAEA,SAAS,mBAAmB,gBAAiE;CAC3F,IAAI,CAAC,gBAAgB,OAAO,EAAE,MAAM,UAAU;CAE9C,MAAM,OAAO,WAAW,cAAc;CACtC,IAAI,SAAS,SAAS,OAAO,EAAE,MAAM,QAAQ;CAC7C,IAAI,SAAS,UAAU,OAAO,EAAE,MAAM,SAAS;CAE/C,MAAM,aACJ,eAAe,cAAc,CAAC,MAAM,QAAQ,eAAe,UAAU,IAAI,eAAe,aAAa,CAAC;CACxG,MAAM,gBAAgB,OAAO,KAAK,UAAU;CAC5C,MAAM,qBAAqB,UAAU,aAAa,SAAS,gBAAgB,aAAa,eAAe,KAAA;CACvG,MAAM,eAAe,OAAO,QAAQ,UAAU,CAAC,CAAC,MAC7C,GAAG,cAAc,WAAW,aAAa,QAAQ,CAAC,MAAM,OAC3D,CAAC,GAAG;CAEJ,IAAI,iBAAiB,sBAAsB,cAAc,UAAU,IACjE,OAAO;EAAE,MAAM;EAAmB;EAAc;CAAmB;CAErE,IAAI,eAAe,wBAAwB,cAAc,WAAW,GAAG,OAAO,EAAE,MAAM,SAAS;CAC/F,OAAO,EAAE,MAAM,SAAS;AAC1B;AAEA,SAAS,gBAAgB,OAA6B;CACpD,OAAO,MAAM,iBAAiB,UAAU,CAAC,MAAM;AACjD;AAEA,SAAgB,uBAAuB,SAAiC,eAAkC;CACxG,OAAO;EACL,SAAS;EACT,QAAQ,OAAO,OAAO,eAAe,CAAC,CAAC,KAAI,UAAS;GAClD,MAAM,iBAAiB,cAAc,MAAM,cAAc;GACzD,OAAO;IACL,QAAQ,MAAM;IACd,MAAM,MAAM;IACZ,cAAc,MAAM;IACpB,iBAAiB,cAAc,MAAM,eAAe;IACpD,kBAAkB,cAAc,MAAM,gBAAgB;IACtD,YAAY,cAAc,MAAM,UAAU;IAC1C;IACA,eAAe,mBAAmB,cAAc;GAClD;EACF,CAAC;CACH;AACF"}

package/dist/{api-schema-manifest-B3bC-D98.cjs → api-schema-manifest-tsMOBlmY.cjs}

@@ -1,5 +1,5 @@
 const require_route_builder = require("./route-builder-CgLVYL1c.cjs");
-const require_routes = require("./routes-CZwPlO3-.cjs");
+const require_routes = require("./routes-BRGPk2DE.cjs");
 //#region src/server/server-adapter/api-schema-manifest.ts
 function convertSchema(schema) {
 	return schema ? require_route_builder.schemaToJsonSchema(schema) : void 0;
@@ -52,4 +52,4 @@ function buildApiSchemaManifest(routes = require_routes.SERVER_ROUTES) {
 //#endregion
 exports.buildApiSchemaManifest = buildApiSchemaManifest;
 
-//# sourceMappingURL=api-schema-manifest-B3bC-D98.cjs.map
+//# sourceMappingURL=api-schema-manifest-tsMOBlmY.cjs.map

package/dist/{api-schema-manifest-B3bC-D98.cjs.map → api-schema-manifest-tsMOBlmY.cjs.map}

@@ -1 +1 @@
-{"version":3,"file":"api-schema-manifest-B3bC-D98.cjs","names":["schemaToJsonSchema","SERVER_ROUTES"],"sources":["../src/server/server-adapter/api-schema-manifest.ts"],"sourcesContent":["import type { JSONSchema7 } from '@mastra/schema-compat';\nimport { schemaToJsonSchema } from './openapi-utils';\nimport { SERVER_ROUTES } from './routes/index';\nimport type { ServerRoute } from './routes/index';\n\nexport interface ApiSchemaResponseShape {\n  kind: 'array' | 'record' | 'object-property' | 'single' | 'unknown';\n  listProperty?: string;\n  paginationProperty?: string;\n}\n\nexport interface ApiSchemaManifestRoute {\n  method: string;\n  path: string;\n  responseType: string;\n  pathParamSchema?: JSONSchema7;\n  queryParamSchema?: JSONSchema7;\n  bodySchema?: JSONSchema7;\n  responseSchema?: JSONSchema7;\n  responseShape: ApiSchemaResponseShape;\n}\n\nexport interface ApiSchemaManifest {\n  version: 1;\n  routes: ApiSchemaManifestRoute[];\n}\n\nfunction convertSchema(schema: ServerRoute['bodySchema']): JSONSchema7 | undefined {\n  return schema ? schemaToJsonSchema(schema) : undefined;\n}\n\nfunction asJsonSchema(value: unknown): JSONSchema7 | undefined {\n  return value && typeof value === 'object' && !Array.isArray(value) ? (value as JSONSchema7) : undefined;\n}\n\nfunction schemaType(schema: JSONSchema7 | undefined): JSONSchema7['type'] | undefined {\n  const type = schema?.type;\n  return Array.isArray(type) ? type.find(Boolean) : type;\n}\n\nfunction inferResponseShape(responseSchema: JSONSchema7 | undefined): ApiSchemaResponseShape {\n  if (!responseSchema) return { kind: 'unknown' };\n\n  const type = schemaType(responseSchema);\n  if (type === 'array') return { kind: 'array' };\n  if (type !== 'object') return { kind: 'single' };\n\n  const properties =\n    responseSchema.properties && !Array.isArray(responseSchema.properties) ? responseSchema.properties : {};\n  const propertyNames = Object.keys(properties);\n  const paginationProperty = 'page' in properties ? 'page' : 'pagination' in properties ? 'pagination' : undefined;\n  const listProperty = Object.entries(properties).find(\n    ([, property]) => schemaType(asJsonSchema(property)) === 'array',\n  )?.[0];\n\n  if (listProperty && (paginationProperty || propertyNames.length <= 2)) {\n    return { kind: 'object-property', listProperty, paginationProperty };\n  }\n  if (responseSchema.additionalProperties && propertyNames.length === 0) return { kind: 'record' };\n  return { kind: 'single' };\n}\n\nfunction isManifestRoute(route: ServerRoute): boolean {\n  return route.responseType === 'json' && !route.deprecated;\n}\n\nexport function buildApiSchemaManifest(routes: readonly ServerRoute[] = SERVER_ROUTES): ApiSchemaManifest {\n  return {\n    version: 1,\n    routes: routes.filter(isManifestRoute).map(route => {\n      const responseSchema = convertSchema(route.responseSchema);\n      return {\n        method: route.method,\n        path: route.path,\n        responseType: route.responseType,\n        pathParamSchema: convertSchema(route.pathParamSchema),\n        queryParamSchema: convertSchema(route.queryParamSchema),\n        bodySchema: convertSchema(route.bodySchema),\n        responseSchema,\n        responseShape: inferResponseShape(responseSchema),\n      };\n    }),\n  };\n}\n"],"mappings":";;;AA2BA,SAAS,cAAc,QAA4D;CACjF,OAAO,SAASA,sBAAAA,mBAAmB,MAAM,IAAI,KAAA;AAC/C;AAEA,SAAS,aAAa,OAAyC;CAC7D,OAAO,SAAS,OAAO,UAAU,YAAY,CAAC,MAAM,QAAQ,KAAK,IAAK,QAAwB,KAAA;AAChG;AAEA,SAAS,WAAW,QAAkE;CACpF,MAAM,OAAO,QAAQ;CACrB,OAAO,MAAM,QAAQ,IAAI,IAAI,KAAK,KAAK,OAAO,IAAI;AACpD;AAEA,SAAS,mBAAmB,gBAAiE;CAC3F,IAAI,CAAC,gBAAgB,OAAO,EAAE,MAAM,UAAU;CAE9C,MAAM,OAAO,WAAW,cAAc;CACtC,IAAI,SAAS,SAAS,OAAO,EAAE,MAAM,QAAQ;CAC7C,IAAI,SAAS,UAAU,OAAO,EAAE,MAAM,SAAS;CAE/C,MAAM,aACJ,eAAe,cAAc,CAAC,MAAM,QAAQ,eAAe,UAAU,IAAI,eAAe,aAAa,CAAC;CACxG,MAAM,gBAAgB,OAAO,KAAK,UAAU;CAC5C,MAAM,qBAAqB,UAAU,aAAa,SAAS,gBAAgB,aAAa,eAAe,KAAA;CACvG,MAAM,eAAe,OAAO,QAAQ,UAAU,CAAC,CAAC,MAC7C,GAAG,cAAc,WAAW,aAAa,QAAQ,CAAC,MAAM,OAC3D,CAAC,GAAG;CAEJ,IAAI,iBAAiB,sBAAsB,cAAc,UAAU,IACjE,OAAO;EAAE,MAAM;EAAmB;EAAc;CAAmB;CAErE,IAAI,eAAe,wBAAwB,cAAc,WAAW,GAAG,OAAO,EAAE,MAAM,SAAS;CAC/F,OAAO,EAAE,MAAM,SAAS;AAC1B;AAEA,SAAS,gBAAgB,OAA6B;CACpD,OAAO,MAAM,iBAAiB,UAAU,CAAC,MAAM;AACjD;AAEA,SAAgB,uBAAuB,SAAiCC,eAAAA,eAAkC;CACxG,OAAO;EACL,SAAS;EACT,QAAQ,OAAO,OAAO,eAAe,CAAC,CAAC,KAAI,UAAS;GAClD,MAAM,iBAAiB,cAAc,MAAM,cAAc;GACzD,OAAO;IACL,QAAQ,MAAM;IACd,MAAM,MAAM;IACZ,cAAc,MAAM;IACpB,iBAAiB,cAAc,MAAM,eAAe;IACpD,kBAAkB,cAAc,MAAM,gBAAgB;IACtD,YAAY,cAAc,MAAM,UAAU;IAC1C;IACA,eAAe,mBAAmB,cAAc;GAClD;EACF,CAAC;CACH;AACF"}
+{"version":3,"file":"api-schema-manifest-tsMOBlmY.cjs","names":["schemaToJsonSchema","SERVER_ROUTES"],"sources":["../src/server/server-adapter/api-schema-manifest.ts"],"sourcesContent":["import type { JSONSchema7 } from '@mastra/schema-compat';\nimport { schemaToJsonSchema } from './openapi-utils';\nimport { SERVER_ROUTES } from './routes/index';\nimport type { ServerRoute } from './routes/index';\n\nexport interface ApiSchemaResponseShape {\n  kind: 'array' | 'record' | 'object-property' | 'single' | 'unknown';\n  listProperty?: string;\n  paginationProperty?: string;\n}\n\nexport interface ApiSchemaManifestRoute {\n  method: string;\n  path: string;\n  responseType: string;\n  pathParamSchema?: JSONSchema7;\n  queryParamSchema?: JSONSchema7;\n  bodySchema?: JSONSchema7;\n  responseSchema?: JSONSchema7;\n  responseShape: ApiSchemaResponseShape;\n}\n\nexport interface ApiSchemaManifest {\n  version: 1;\n  routes: ApiSchemaManifestRoute[];\n}\n\nfunction convertSchema(schema: ServerRoute['bodySchema']): JSONSchema7 | undefined {\n  return schema ? schemaToJsonSchema(schema) : undefined;\n}\n\nfunction asJsonSchema(value: unknown): JSONSchema7 | undefined {\n  return value && typeof value === 'object' && !Array.isArray(value) ? (value as JSONSchema7) : undefined;\n}\n\nfunction schemaType(schema: JSONSchema7 | undefined): JSONSchema7['type'] | undefined {\n  const type = schema?.type;\n  return Array.isArray(type) ? type.find(Boolean) : type;\n}\n\nfunction inferResponseShape(responseSchema: JSONSchema7 | undefined): ApiSchemaResponseShape {\n  if (!responseSchema) return { kind: 'unknown' };\n\n  const type = schemaType(responseSchema);\n  if (type === 'array') return { kind: 'array' };\n  if (type !== 'object') return { kind: 'single' };\n\n  const properties =\n    responseSchema.properties && !Array.isArray(responseSchema.properties) ? responseSchema.properties : {};\n  const propertyNames = Object.keys(properties);\n  const paginationProperty = 'page' in properties ? 'page' : 'pagination' in properties ? 'pagination' : undefined;\n  const listProperty = Object.entries(properties).find(\n    ([, property]) => schemaType(asJsonSchema(property)) === 'array',\n  )?.[0];\n\n  if (listProperty && (paginationProperty || propertyNames.length <= 2)) {\n    return { kind: 'object-property', listProperty, paginationProperty };\n  }\n  if (responseSchema.additionalProperties && propertyNames.length === 0) return { kind: 'record' };\n  return { kind: 'single' };\n}\n\nfunction isManifestRoute(route: ServerRoute): boolean {\n  return route.responseType === 'json' && !route.deprecated;\n}\n\nexport function buildApiSchemaManifest(routes: readonly ServerRoute[] = SERVER_ROUTES): ApiSchemaManifest {\n  return {\n    version: 1,\n    routes: routes.filter(isManifestRoute).map(route => {\n      const responseSchema = convertSchema(route.responseSchema);\n      return {\n        method: route.method,\n        path: route.path,\n        responseType: route.responseType,\n        pathParamSchema: convertSchema(route.pathParamSchema),\n        queryParamSchema: convertSchema(route.queryParamSchema),\n        bodySchema: convertSchema(route.bodySchema),\n        responseSchema,\n        responseShape: inferResponseShape(responseSchema),\n      };\n    }),\n  };\n}\n"],"mappings":";;;AA2BA,SAAS,cAAc,QAA4D;CACjF,OAAO,SAASA,sBAAAA,mBAAmB,MAAM,IAAI,KAAA;AAC/C;AAEA,SAAS,aAAa,OAAyC;CAC7D,OAAO,SAAS,OAAO,UAAU,YAAY,CAAC,MAAM,QAAQ,KAAK,IAAK,QAAwB,KAAA;AAChG;AAEA,SAAS,WAAW,QAAkE;CACpF,MAAM,OAAO,QAAQ;CACrB,OAAO,MAAM,QAAQ,IAAI,IAAI,KAAK,KAAK,OAAO,IAAI;AACpD;AAEA,SAAS,mBAAmB,gBAAiE;CAC3F,IAAI,CAAC,gBAAgB,OAAO,EAAE,MAAM,UAAU;CAE9C,MAAM,OAAO,WAAW,cAAc;CACtC,IAAI,SAAS,SAAS,OAAO,EAAE,MAAM,QAAQ;CAC7C,IAAI,SAAS,UAAU,OAAO,EAAE,MAAM,SAAS;CAE/C,MAAM,aACJ,eAAe,cAAc,CAAC,MAAM,QAAQ,eAAe,UAAU,IAAI,eAAe,aAAa,CAAC;CACxG,MAAM,gBAAgB,OAAO,KAAK,UAAU;CAC5C,MAAM,qBAAqB,UAAU,aAAa,SAAS,gBAAgB,aAAa,eAAe,KAAA;CACvG,MAAM,eAAe,OAAO,QAAQ,UAAU,CAAC,CAAC,MAC7C,GAAG,cAAc,WAAW,aAAa,QAAQ,CAAC,MAAM,OAC3D,CAAC,GAAG;CAEJ,IAAI,iBAAiB,sBAAsB,cAAc,UAAU,IACjE,OAAO;EAAE,MAAM;EAAmB;EAAc;CAAmB;CAErE,IAAI,eAAe,wBAAwB,cAAc,WAAW,GAAG,OAAO,EAAE,MAAM,SAAS;CAC/F,OAAO,EAAE,MAAM,SAAS;AAC1B;AAEA,SAAS,gBAAgB,OAA6B;CACpD,OAAO,MAAM,iBAAiB,UAAU,CAAC,MAAM;AACjD;AAEA,SAAgB,uBAAuB,SAAiCC,eAAAA,eAAkC;CACxG,OAAO;EACL,SAAS;EACT,QAAQ,OAAO,OAAO,eAAe,CAAC,CAAC,KAAI,UAAS;GAClD,MAAM,iBAAiB,cAAc,MAAM,cAAc;GACzD,OAAO;IACL,QAAQ,MAAM;IACd,MAAM,MAAM;IACZ,cAAc,MAAM;IACpB,iBAAiB,cAAc,MAAM,eAAe;IACpD,kBAAkB,cAAc,MAAM,gBAAgB;IACtD,YAAY,cAAc,MAAM,UAAU;IAC1C;IACA,eAAe,mBAAmB,cAAc;GAClD;EACF,CAAC;CACH;AACF"}

package/dist/{dist-BKRMiJcn.js → dist-DkY6iCA4.js}

@@ -5959,7 +5959,7 @@ function splitLines(text) {
 	return result;
 }
 //#endregion
-//#region ../memory/dist/src-CdqJP57F.js
+//#region ../memory/dist/src-MScpLVRh.js
 var __defProp$3 = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
@@ -24380,33 +24380,62 @@ var TokenCounter = class TokenCounter {
 		if (isImageAttachment) await resolveImageDimensionsAsync(part);
 		return this.countAttachmentPartSync(part);
 	}
+	/**
+	* Count the name and the arguments of a tool call. Every state before the tool produces an
+	* output holds the same call signature in the context window, so all of those states share
+	* these cache kinds. `buildEstimateKey` hashes the text, so a shared kind stays correct and
+	* keeps the estimate warm while the invocation moves from one state to the next.
+	*/
+	countToolCallSignature(part, invocation) {
+		let tokens = 0;
+		let overheadDelta = 0;
+		if (invocation.toolName) tokens += this.readOrPersistPartEstimate(part, "tool-call-name", invocation.toolName);
+		if (invocation.args) if (typeof invocation.args === "string") tokens += this.readOrPersistPartEstimate(part, "tool-call-args", invocation.args);
+		else {
+			const argsJson = JSON.stringify(invocation.args);
+			tokens += this.readOrPersistPartEstimate(part, "tool-call-args-json", argsJson);
+			overheadDelta -= 12;
+		}
+		return {
+			tokens,
+			overheadDelta
+		};
+	}
 	countNonAttachmentPart(part) {
 		let overheadDelta = 0;
-		let toolResultDelta = 0;
+		let extraMessageDelta = 0;
 		if (part.type === "text") return {
 			tokens: this.readOrPersistPartEstimate(part, "text", part.text),
 			overheadDelta,
-			toolResultDelta
+			extraMessageDelta
 		};
 		if (part.type === "tool-invocation") {
 			const invocation = part.toolInvocation;
+			const state = invocation.state;
 			let tokens = 0;
-			if (invocation.state === "call" || invocation.state === "partial-call") {
-				if (invocation.toolName) tokens += this.readOrPersistPartEstimate(part, `tool-${invocation.state}-name`, invocation.toolName);
-				if (invocation.args) if (typeof invocation.args === "string") tokens += this.readOrPersistPartEstimate(part, `tool-${invocation.state}-args`, invocation.args);
-				else {
-					const argsJson = JSON.stringify(invocation.args);
-					tokens += this.readOrPersistPartEstimate(part, `tool-${invocation.state}-args-json`, argsJson);
-					overheadDelta -= 12;
-				}
+			if (state === "call" || state === "partial-call" || state === "approval-requested") {
+				const signature = this.countToolCallSignature(part, invocation);
+				return {
+					tokens: signature.tokens,
+					overheadDelta: overheadDelta + signature.overheadDelta,
+					extraMessageDelta
+				};
+			}
+			if (state === "approval-responded") {
+				extraMessageDelta++;
+				const signature = this.countToolCallSignature(part, invocation);
+				tokens += signature.tokens;
+				overheadDelta += signature.overheadDelta;
+				const reason = invocation.approval?.reason;
+				if (reason) tokens += this.readOrPersistPartEstimate(part, "tool-approval-reason", reason);
 				return {
 					tokens,
 					overheadDelta,
-					toolResultDelta
+					extraMessageDelta
 				};
 			}
-			if (invocation.state === "result") {
-				toolResultDelta++;
+			if (state === "result") {
+				extraMessageDelta++;
 				const { value: resultForCounting, usingStoredModelOutput } = this.resolveToolResultForTokenCounting(part, invocation.result);
 				if (resultForCounting !== void 0) {
 					const contentTokens = this.countMultimodalToolResultContent(part, resultForCounting);
@@ -24420,47 +24449,45 @@ var TokenCounter = class TokenCounter {
 				return {
 					tokens,
 					overheadDelta,
-					toolResultDelta
+					extraMessageDelta
 				};
 			}
-			if (invocation.state === "output-denied") {
-				toolResultDelta++;
+			if (state === "output-denied") {
+				extraMessageDelta++;
 				const reason = invocation.approval?.reason ?? "Tool call was not approved by the user";
 				tokens += this.readOrPersistPartEstimate(part, "tool-result-denied", reason);
 				return {
 					tokens,
 					overheadDelta,
-					toolResultDelta
+					extraMessageDelta
 				};
 			}
-			if (invocation.state === "output-error") {
-				toolResultDelta++;
-				const errorText = invocation.errorText;
-				const errorMessage = typeof errorText === "string" ? errorText : "Tool execution failed";
+			if (state === "output-error") {
+				extraMessageDelta++;
+				const errorMessage = typeof invocation.errorText === "string" ? invocation.errorText : "Tool execution failed";
 				tokens += this.readOrPersistPartEstimate(part, "tool-result-error", errorMessage);
 				return {
 					tokens,
 					overheadDelta,
-					toolResultDelta
+					extraMessageDelta
 				};
 			}
-			throw new Error(`Unhandled tool-invocation state '${part.toolInvocation?.state}' in token counting for part type '${part.type}'`);
 		}
 		if (typeof part.type === "string" && part.type.startsWith("data-")) return {
 			tokens: 0,
 			overheadDelta,
-			toolResultDelta
+			extraMessageDelta
 		};
 		if (part.type === "reasoning") return {
 			tokens: 0,
 			overheadDelta,
-			toolResultDelta
+			extraMessageDelta
 		};
 		const serialized = serializePartForTokenCounting(part);
 		return {
 			tokens: this.readOrPersistPartEstimate(part, `part-${part.type}`, serialized),
 			overheadDelta,
-			toolResultDelta
+			extraMessageDelta
 		};
 	}
 	/**
@@ -24469,7 +24496,7 @@ var TokenCounter = class TokenCounter {
 	countMessage(message) {
 		let payloadTokens = this.countString(message.role);
 		let overhead = TokenCounter.TOKENS_PER_MESSAGE;
-		let toolResultCount = 0;
+		let extraMessageCount = 0;
 		if (typeof message.content === "string") payloadTokens += this.readOrPersistMessageEstimate(message, "message-content", message.content);
 		else if (message.content && typeof message.content === "object") {
 			if (message.content.content && !Array.isArray(message.content.parts)) payloadTokens += this.readOrPersistMessageEstimate(message, "content-content", message.content.content);
@@ -24482,16 +24509,16 @@ var TokenCounter = class TokenCounter {
 				const result = this.countNonAttachmentPart(part);
 				payloadTokens += result.tokens;
 				overhead += result.overheadDelta;
-				toolResultCount += result.toolResultDelta;
+				extraMessageCount += result.extraMessageDelta;
 			}
 		}
-		if (toolResultCount > 0) overhead += toolResultCount * TokenCounter.TOKENS_PER_MESSAGE;
+		if (extraMessageCount > 0) overhead += extraMessageCount * TokenCounter.TOKENS_PER_MESSAGE;
 		return Math.round(payloadTokens + overhead);
 	}
 	async countMessageAsync(message) {
 		let payloadTokens = this.countString(message.role);
 		let overhead = TokenCounter.TOKENS_PER_MESSAGE;
-		let toolResultCount = 0;
+		let extraMessageCount = 0;
 		if (typeof message.content === "string") payloadTokens += this.readOrPersistMessageEstimate(message, "message-content", message.content);
 		else if (message.content && typeof message.content === "object") {
 			if (message.content.content && !Array.isArray(message.content.parts)) payloadTokens += this.readOrPersistMessageEstimate(message, "content-content", message.content.content);
@@ -24504,10 +24531,10 @@ var TokenCounter = class TokenCounter {
 				const result = this.countNonAttachmentPart(part);
 				payloadTokens += result.tokens;
 				overhead += result.overheadDelta;
-				toolResultCount += result.toolResultDelta;
+				extraMessageCount += result.extraMessageDelta;
 			}
 		}
-		if (toolResultCount > 0) overhead += toolResultCount * TokenCounter.TOKENS_PER_MESSAGE;
+		if (extraMessageCount > 0) overhead += extraMessageCount * TokenCounter.TOKENS_PER_MESSAGE;
 		return Math.round(payloadTokens + overhead);
 	}
 	/**
@@ -25602,6 +25629,7 @@ function deepMergeWorkingMemory(existing, update) {
 	for (const key of Object.keys(update)) {
 		const updateValue = update[key];
 		const existingValue = result[key];
+		if (updateValue === void 0) continue;
 		if (updateValue === null) delete result[key];
 		else if (Array.isArray(updateValue)) result[key] = updateValue;
 		else if (typeof updateValue === "object" && updateValue !== null && typeof existingValue === "object" && existingValue !== null && !Array.isArray(existingValue)) result[key] = deepMergeWorkingMemory(existingValue, updateValue);
@@ -25654,7 +25682,7 @@ const updateWorkingMemoryTool = (memoryConfig) => {
 			version: 1,
 			vendor: "mastra",
 			validate: (value) => {
-				const memoryValue = !!value && typeof value === "object" && !Array.isArray(value) && "memory" in value ? value.memory : stripNullsFromOptional(value, jsonSchema);
+				const memoryValue = stripNullsFromOptional(!!value && typeof value === "object" && !Array.isArray(value) && "memory" in value ? value.memory : value, jsonSchema);
 				const result = validateMemory(memoryValue);
 				return result instanceof Promise ? result.then(toWrappedResult) : toWrappedResult(result);
 			},
@@ -25671,6 +25699,7 @@ const updateWorkingMemoryTool = (memoryConfig) => {
 		id: "update-working-memory",
 		description: schema ? useStateSignals ? `${stateSignalsPreamble} Data is merged with existing memory — only include fields you want to add or update.` : `Update the working memory with new information. Data is merged with existing memory - only include fields you want to add or update. To preserve existing data, omit the field entirely. Arrays are replaced entirely when provided, so pass the complete array or omit it to keep the existing values.` : useStateSignals ? `${stateSignalsPreamble} Pass the full updated Markdown blob as a string in the memory field.` : `Update the working memory with new information. Any data not included will be overwritten. Always pass data as string to the memory field. Never pass an object.`,
 		inputSchema,
+		...usesMergeSemantics ? { strict: false } : {},
 		execute: async (inputData, context) => {
 			const workingMemoryInput = inputData;
 			const threadId = context?.agent?.threadId;
@@ -44743,4 +44772,4 @@ const agentBuilderWorkflows = {
 //#endregion
 export { agentBuilderWorkflows };
 
-//# sourceMappingURL=dist-BKRMiJcn.js.map
+//# sourceMappingURL=dist-DkY6iCA4.js.map