.NET - [Breaking]: Update Declarative Object Model + Dependencies (#3017)

* Builds locally and tests pass * Fix typo * Reverted nuget config change to remove internal feed and map to new public object model package with renames. * Renaming Bot object model in additional sample. --------- Co-authored-by: Peter Ibekwe <peibekwe@microsoft.com>
2026-06-16 21:04:09 +08:00 · 2026-01-28 20:00:37 +00:00
parent 45a020be43
commit 75a8335af5
160 changed files with 253 additions and 239 deletions
@@ -2,7 +2,7 @@

 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;

@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -2,7 +2,7 @@

 using System.Collections.Frozen;
 using System.Collections.Generic;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -3,7 +3,7 @@
 using System.Collections.Frozen;
 using System.Collections.Generic;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Shared.Diagnostics;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;

@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;

@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Shared.Diagnostics;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.

 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;

@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;

@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Shared.Diagnostics;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;

@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.

 using System.Linq;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Shared.Diagnostics;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;

@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Shared.Diagnostics;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;

@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -2,7 +2,7 @@

 using System.Collections.Frozen;
 using System.Collections.Generic;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;

@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using System;
    
    /// <summary>
@@ -1,7 +1,7 @@
 <#@ template language="C#" inherits="CodeTemplate, IModeledAction" visibility="internal" linePragmas="false"  #>
 <#@ import namespace="Microsoft.Agents.AI.Workflows.Declarative.Extensions" #>
 <#@ import namespace="Microsoft.Agents.AI.Workflows.Declarative.Interpreter" #>
-<#@ import namespace="Microsoft.Bot.ObjectModel" #>
+<#@ import namespace="Microsoft.Agents.ObjectModel" #>
 <#@ assembly name="System.Core" #>
 /// <summary>
 /// The root executor for a declarative workflow.
@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;

@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;

@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Shared.Diagnostics;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
@@ -11,7 +11,7 @@ namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen
 {
    using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
    using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
-    using Microsoft.Bot.ObjectModel;
+    using Microsoft.Agents.ObjectModel;
    using Microsoft.Extensions.AI;
    using System.Collections.Generic;
    using System;
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Shared.Diagnostics;

 namespace Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
@@ -1,6 +1,6 @@
 <#@ import namespace="Microsoft.Agents.AI.Workflows.Declarative.Extensions" #>
 <#@ import namespace="Microsoft.Agents.AI.Workflows.Declarative.ObjectModel" #>
-<#@ import namespace="Microsoft.Bot.ObjectModel" #>
+<#@ import namespace="Microsoft.Agents.ObjectModel" #>
 <#@ import namespace="Microsoft.Extensions.AI" #>
 <#@ import namespace="System.Collections.Generic" #>
 <#@ include file="AssignVariableTemplate.tt" once="true" #>
@@ -5,8 +5,8 @@ using System.IO;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Yaml;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Yaml;
 using Microsoft.Extensions.AI;

 namespace Microsoft.Agents.AI.Workflows.Declarative;
@@ -3,7 +3,7 @@
 using System;
 using System.Net.Mail;
 using System.Text.RegularExpressions;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;

 namespace Microsoft.Agents.AI.Workflows.Declarative.Entities;
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.

 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative;

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.

 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative;

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.Extensions;

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Microsoft.PowerFx.Types;

@@ -16,7 +16,7 @@ internal static class ChatMessageExtensions
        FormulaValue.NewRecordFromFields(message.GetMessageFields());

    public static TableValue ToTable(this IEnumerable<ChatMessage> messages) =>
-        FormulaValue.NewTable(TypeSchema.Message.MessageRecordType, messages.Select(message => message.ToRecord()));
+        FormulaValue.NewTable(TypeSchema.Message.RecordType, messages.Select(message => message.ToRecord()));

    public static IEnumerable<ChatMessage>? ToChatMessages(this DataValue? messages)
    {
@@ -158,16 +158,16 @@ internal static class ChatMessageExtensions
        {
            foreach (RecordDataValue contentItem in content.Values)
            {
-                StringDataValue? contentValue = contentItem.GetProperty<StringDataValue>(TypeSchema.Message.Fields.ContentValue);
+                StringDataValue? contentValue = contentItem.GetProperty<StringDataValue>(TypeSchema.MessageContent.Fields.Value);
                if (contentValue is null || string.IsNullOrWhiteSpace(contentValue.Value))
                {
                    continue;
                }
                yield return
-                    contentItem.GetProperty<StringDataValue>(TypeSchema.Message.Fields.ContentType)?.Value switch
+                    contentItem.GetProperty<StringDataValue>(TypeSchema.MessageContent.Fields.Type)?.Value switch
                    {
-                        TypeSchema.Message.ContentTypes.ImageUrl => GetImageContent(contentValue.Value),
-                        TypeSchema.Message.ContentTypes.ImageFile => new HostedFileContent(contentValue.Value),
+                        TypeSchema.MessageContent.ContentTypes.ImageUrl => GetImageContent(contentValue.Value),
+                        TypeSchema.MessageContent.ContentTypes.ImageFile => new HostedFileContent(contentValue.Value),
                        _ => new TextContent(contentValue.Value)
                    };
            }
@@ -196,7 +196,7 @@ internal static class ChatMessageExtensions
        yield return new NamedValue(TypeSchema.Message.Fields.Id, message.MessageId.ToFormula());
        yield return new NamedValue(TypeSchema.Message.Fields.Role, message.Role.Value.ToFormula());
        yield return new NamedValue(TypeSchema.Message.Fields.Author, message.AuthorName.ToFormula());
-        yield return new NamedValue(TypeSchema.Message.Fields.Content, FormulaValue.NewTable(TypeSchema.Message.ContentRecordType, message.GetContentRecords()));
+        yield return new NamedValue(TypeSchema.Message.Fields.Content, FormulaValue.NewTable(TypeSchema.MessageContent.RecordType, message.GetContentRecords()));
        yield return new NamedValue(TypeSchema.Message.Fields.Text, message.Text.ToFormula());
        yield return new NamedValue(TypeSchema.Message.Fields.Metadata, message.AdditionalProperties.ToRecord());
    }
@@ -209,19 +209,24 @@ internal static class ChatMessageExtensions
        return
            content switch
            {
-                UriContent uriContent => CreateContentRecord(TypeSchema.Message.ContentTypes.ImageUrl, uriContent.Uri.ToString()),
-                HostedFileContent fileContent => CreateContentRecord(TypeSchema.Message.ContentTypes.ImageFile, fileContent.FileId),
-                TextContent textContent => CreateContentRecord(TypeSchema.Message.ContentTypes.Text, textContent.Text),
-                DataContent dataContent => CreateContentRecord(TypeSchema.Message.ContentTypes.ImageUrl, dataContent.Uri),
+                UriContent uriContent => CreateContentRecord(TypeSchema.MessageContent.ContentTypes.ImageUrl, uriContent.Uri.ToString()),
+                HostedFileContent fileContent => CreateContentRecord(TypeSchema.MessageContent.ContentTypes.ImageFile, fileContent.FileId),
+                TextContent textContent => CreateContentRecord(TypeSchema.MessageContent.ContentTypes.Text, textContent.Text),
+                DataContent dataContent => CreateContentRecord(TypeSchema.MessageContent.ContentTypes.ImageUrl, dataContent.Uri),
                _ => []
            };

-        static IEnumerable<NamedValue> CreateContentRecord(string type, string value)
+        static IEnumerable<NamedValue> CreateContentRecord(string type, string value, string? mediaType = null)
        {
-            yield return new NamedValue(TypeSchema.Message.Fields.ContentType, type.ToFormula());
-            yield return new NamedValue(TypeSchema.Message.Fields.ContentValue, value.ToFormula());
+            yield return new NamedValue(TypeSchema.MessageContent.Fields.Type, type.ToFormula());
+            yield return new NamedValue(TypeSchema.MessageContent.Fields.Value, value.ToFormula());
+            if (mediaType is not null)
+            {
+                yield return new NamedValue(TypeSchema.MessageContent.Fields.MediaType, mediaType.ToFormula());
+            }
        }
    }
+
    private static RecordValue ToRecord(this AdditionalPropertiesDictionary? value)
    {
        return FormulaValue.NewRecordFromFields(GetFields());
@@ -8,7 +8,7 @@ using System.Dynamic;
 using System.Linq;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Microsoft.PowerFx.Types;

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.

 using System.Linq;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.Extensions;

@@ -10,7 +10,7 @@ using System.Text.Json;
 using System.Text.Json.Nodes;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Microsoft.PowerFx.Types;
 using BlankType = Microsoft.PowerFx.Types.BlankType;
@@ -259,7 +259,7 @@ internal static class FormulaValueExtensions
                        [.. value.OfType<ExpandoObject>().Select(element => element.ToRecord())]),
                _ when typeof(ChatMessage).IsAssignableFrom(elementType) =>
                    FormulaValue.NewTable(
-                        TypeSchema.Message.MessageRecordType,
+                        TypeSchema.Message.RecordType,
                        [.. value.OfType<ChatMessage>().Select(message => message.ToRecord())]),
                _ when typeof(IDictionary).IsAssignableFrom(elementType) => value.ToTableOfRecords(),
                _ => throw new DeclarativeModelException($"Unsupported element type: {elementType.Name}"),
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;
 using Microsoft.Shared.Diagnostics;

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Microsoft.PowerFx.Types;

@@ -2,7 +2,7 @@

 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx;

 namespace Microsoft.Agents.AI.Workflows.Declarative.Extensions;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.PowerFx;
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;

 namespace Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
@@ -8,7 +8,7 @@ using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.Interpreter;

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.Interpreter;

@@ -7,7 +7,7 @@ using Microsoft.Agents.AI.Workflows.Declarative.CodeGen;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.Interpreter;

@@ -7,8 +7,8 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Abstractions;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.Kit;

@@ -6,7 +6,7 @@ using System.Collections.Frozen;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.Kit;

@@ -20,9 +20,9 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.Bot.ObjectModel" />
-    <PackageReference Include="Microsoft.Bot.ObjectModel.Json" />
-    <PackageReference Include="Microsoft.Bot.ObjectModel.PowerFx" />
+    <PackageReference Include="Microsoft.Agents.ObjectModel" />
+    <PackageReference Include="Microsoft.Agents.ObjectModel.Json" />
+    <PackageReference Include="Microsoft.Agents.ObjectModel.PowerFx" />
    <PackageReference Include="Microsoft.PowerFx.Interpreter" />
    <PackageReference Include="Microsoft.Extensions.Configuration" />
    <PackageReference Include="Microsoft.Extensions.Logging" />
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Microsoft.Shared.Diagnostics;

@@ -5,8 +5,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Abstractions;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;

@@ -7,8 +7,8 @@ using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Abstractions;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Abstractions;

 namespace Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;

@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Abstractions;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Abstractions;
 using Microsoft.Extensions.AI;
 using Microsoft.Shared.Diagnostics;

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;

 namespace Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
@@ -4,7 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;

@@ -7,8 +7,8 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Abstractions;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Abstractions;
 using Microsoft.PowerFx.Types;
 using Microsoft.Shared.Diagnostics;

@@ -7,8 +7,8 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Abstractions;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Abstractions;
 using Microsoft.PowerFx.Types;
 using Microsoft.Shared.Diagnostics;

@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Abstractions;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Abstractions;
 using Microsoft.PowerFx.Types;
 using Microsoft.Shared.Diagnostics;

@@ -10,8 +10,8 @@ using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Abstractions;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Abstractions;
 using Microsoft.Extensions.AI;
 using Microsoft.Shared.Diagnostics;

@@ -7,8 +7,8 @@ using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Abstractions;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Abstractions;
 using Microsoft.PowerFx.Types;
 using Microsoft.Shared.Diagnostics;

@@ -9,7 +9,7 @@ using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Microsoft.PowerFx.Types;
 using Microsoft.Shared.Diagnostics;
@@ -7,7 +7,7 @@ using Microsoft.Agents.AI.Workflows.Declarative.Events;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;

 namespace Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Shared.Diagnostics;

 namespace Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Microsoft.Shared.Diagnostics;

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.Extensions.AI;
 using Microsoft.Shared.Diagnostics;

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;

 namespace Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;

@@ -5,8 +5,8 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Abstractions;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Abstractions;
 using Microsoft.PowerFx.Types;

 namespace Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;

 namespace Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
@@ -5,8 +5,8 @@ using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Interpreter;
 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Abstractions;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Abstractions;
 using Microsoft.PowerFx.Types;

 namespace Microsoft.Agents.AI.Workflows.Declarative.ObjectModel;
@@ -23,12 +23,12 @@ internal abstract class MessageFunction : ReflectionFunction
                    TypeSchema.Message.Fields.Content,
                    FormulaValue.NewTable(
                        RecordType.Empty()
-                            .Add(TypeSchema.Message.Fields.ContentType, FormulaType.String)
-                            .Add(TypeSchema.Message.Fields.ContentValue, FormulaType.String),
+                            .Add(TypeSchema.MessageContent.Fields.Type, FormulaType.String)
+                            .Add(TypeSchema.MessageContent.Fields.Value, FormulaType.String),
                        [
                            FormulaValue.NewRecordFromFields(
-                                new NamedValue(TypeSchema.Message.Fields.ContentType, FormulaValue.New(TypeSchema.Message.ContentTypes.Text)),
-                                new NamedValue(TypeSchema.Message.Fields.ContentValue, input))
+                                new NamedValue(TypeSchema.MessageContent.Fields.Type, FormulaValue.New(TypeSchema.MessageContent.ContentTypes.Text)),
+                                new NamedValue(TypeSchema.MessageContent.Fields.Value, input))
                        ]
                    )
                )
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.

 using Microsoft.Agents.AI.Workflows.Declarative.PowerFx.Functions;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx;
 using Microsoft.PowerFx.Types;

@@ -6,8 +6,8 @@ using System.Globalization;
 using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
 using Microsoft.Agents.AI.Workflows.Declarative.Kit;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.SystemVariables;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.SystemVariables;
 using Microsoft.Extensions.AI;
 using Microsoft.PowerFx.Types;

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.

-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx.Types;

 namespace Microsoft.Agents.AI.Workflows.Declarative.PowerFx;
@@ -9,6 +9,29 @@ internal static class TypeSchema
 {
    public const string Discriminator = "__type__";

+    public static class MessageContent
+    {
+        public static class Fields
+        {
+            public const string Type = nameof(Type);
+            public const string Value = nameof(Value);
+            public const string MediaType = nameof(MediaType);
+        }
+
+        public static class ContentTypes
+        {
+            public const string Text = nameof(AgentMessageContentType.Text);
+            public const string ImageUrl = nameof(AgentMessageContentType.ImageUrl);
+            public const string ImageFile = nameof(AgentMessageContentType.ImageFile);
+        }
+
+        public static readonly RecordType RecordType =
+            RecordType.Empty()
+                .Add(Fields.Type, FormulaType.String)
+                .Add(Fields.Value, FormulaType.String)
+                .Add(Fields.MediaType, FormulaType.String);
+    }
+
    public static class Message
    {
        public static class Fields
@@ -21,29 +44,15 @@ internal static class TypeSchema
            public const string Author = nameof(Author);
            public const string Text = nameof(Text);
            public const string Content = nameof(Content);
-            public const string ContentType = nameof(ContentType);
-            public const string ContentValue = nameof(ContentValue);
            public const string Metadata = nameof(Metadata);
        }

-        public static class ContentTypes
-        {
-            public const string Text = nameof(AgentMessageContentType.Text);
-            public const string ImageUrl = nameof(AgentMessageContentType.ImageUrl);
-            public const string ImageFile = nameof(AgentMessageContentType.ImageFile);
-        }
-
-        public static readonly RecordType ContentRecordType =
-            RecordType.Empty()
-                .Add(Fields.ContentType, FormulaType.String)
-                .Add(Fields.ContentValue, FormulaType.String);
-
-        public static readonly RecordType MessageRecordType =
+        public static readonly RecordType RecordType =
            RecordType.Empty()
                .Add(Fields.Id, FormulaType.String)
                .Add(Fields.Role, FormulaType.String)
                .Add(Fields.Author, FormulaType.String)
-                .Add(Fields.Content, ContentRecordType.ToTable())
+                .Add(Fields.Content, MessageContent.RecordType.ToTable())
                .Add(Fields.Text, FormulaType.String)
                .Add(Fields.Metadata, RecordType.Empty());
    }
@@ -4,10 +4,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Abstractions;
-using Microsoft.Bot.ObjectModel.Analysis;
-using Microsoft.Bot.ObjectModel.PowerFx;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Abstractions;
+using Microsoft.Agents.ObjectModel.Analysis;
+using Microsoft.Agents.ObjectModel.PowerFx;
 using Microsoft.Extensions.Configuration;
 using Microsoft.PowerFx.Types;

@@ -4,9 +4,9 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
-using Microsoft.Bot.ObjectModel;
-using Microsoft.Bot.ObjectModel.Abstractions;
-using Microsoft.Bot.ObjectModel.Exceptions;
+using Microsoft.Agents.ObjectModel;
+using Microsoft.Agents.ObjectModel.Abstractions;
+using Microsoft.Agents.ObjectModel.Exceptions;
 using Microsoft.PowerFx;
 using Microsoft.PowerFx.Types;
 using Microsoft.Shared.Diagnostics;
@@ -7,7 +7,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Agents.AI.Workflows.Declarative.Extensions;
-using Microsoft.Bot.ObjectModel;
+using Microsoft.Agents.ObjectModel;
 using Microsoft.PowerFx;
 using Microsoft.PowerFx.Types;