Merge branch 'main' into feature-foundry-agents

dotnet/src/Microsoft.Agents.AI.Abstractions/InMemoryChatMessageStore.cs

@@ -97,8 +97,9 @@ public sealed class InMemoryChatMessageStore : ChatMessageStore, IList<ChatMessa
 
         if (serializedStoreState.ValueKind is JsonValueKind.Object)
         {
+            var jso = jsonSerializerOptions ?? AgentAbstractionsJsonUtilities.DefaultOptions;
             var state = serializedStoreState.Deserialize(
-                AgentAbstractionsJsonUtilities.DefaultOptions.GetTypeInfo(typeof(StoreState))) as StoreState;
+                jso.GetTypeInfo(typeof(StoreState))) as StoreState;
             if (state?.Messages is { } messages)
             {
                 this._messages = messages;
@@ -164,7 +165,8 @@ public sealed class InMemoryChatMessageStore : ChatMessageStore, IList<ChatMessa
             Messages = this._messages,
         };
 
-        return JsonSerializer.SerializeToElement(state, AgentAbstractionsJsonUtilities.DefaultOptions.GetTypeInfo(typeof(StoreState)));
+        var jso = jsonSerializerOptions ?? AgentAbstractionsJsonUtilities.DefaultOptions;
+        return JsonSerializer.SerializeToElement(state, jso.GetTypeInfo(typeof(StoreState)));
     }
 
     /// <inheritdoc />

dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/InMemoryChatMessageStoreTests.cs

@@ -3,7 +3,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Encodings.Web;
 using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.AI;
@@ -114,6 +116,29 @@ public class InMemoryChatMessageStoreTests
         Assert.Equal("B", newStore[1].Text);
     }
 
+    [Fact]
+    public async Task SerializeAndDeserializeConstructorRoundtripsWithCustomAIContentAsync()
+    {
+        JsonSerializerOptions options = new(TestJsonSerializerContext.Default.Options)
+        {
+            TypeInfoResolver = JsonTypeInfoResolver.Combine(AgentAbstractionsJsonUtilities.DefaultOptions.TypeInfoResolver, TestJsonSerializerContext.Default),
+            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+        };
+        options.AddAIContentType<TestAIContent>(typeDiscriminatorId: "testContent");
+
+        var store = new InMemoryChatMessageStore
+        {
+            new ChatMessage(ChatRole.User, [new TestAIContent("foo data")]),
+        };
+
+        var jsonElement = store.Serialize(options);
+        var newStore = new InMemoryChatMessageStore(jsonElement, options);
+
+        Assert.Single(newStore);
+        var actualTestAIContent = Assert.IsType<TestAIContent>(newStore[0].Contents[0]);
+        Assert.Equal("foo data", actualTestAIContent.TestData);
+    }
+
     [Fact]
     public async Task SerializeAndDeserializeWorksWithExperimentalContentTypesAsync()
     {
@@ -558,4 +583,9 @@ public class InMemoryChatMessageStoreTests
         Assert.Equal("Hello", result[0].Text);
         reducerMock.Verify(r => r.ReduceAsync(It.IsAny<IEnumerable<ChatMessage>>(), It.IsAny<CancellationToken>()), Times.Never);
     }
+
+    public class TestAIContent(string testData) : AIContent
+    {
+        public string TestData => testData;
+    }
 }

dotnet/tests/Microsoft.Agents.AI.Abstractions.UnitTests/TestJsonSerializerContext.cs

@@ -22,4 +22,5 @@ namespace Microsoft.Agents.AI.Abstractions.UnitTests;
 [JsonSerializable(typeof(InMemoryAgentThread.InMemoryAgentThreadState))]
 [JsonSerializable(typeof(ServiceIdAgentThread.ServiceIdAgentThreadState))]
 [JsonSerializable(typeof(ServiceIdAgentThreadTests.EmptyObject))]
+[JsonSerializable(typeof(InMemoryChatMessageStoreTests.TestAIContent))]
 internal sealed partial class TestJsonSerializerContext : JsonSerializerContext;

python/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.0b251112.post1] - 2025-11-12
+
+### Added
+
+- **agent-framework-azurefunctions**: Merge Azure Functions feature branch (#1916)
+
+### Fixed
+
+- **agent-framework-ag-ui**: fix tool call id mismatch in ag-ui ([#2166](https://github.com/microsoft/agent-framework/pull/2166))
+
 ## [1.0.0b251112] - 2025-11-12
 
 ### Added
@@ -219,7 +229,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 For more information, see the [announcement blog post](https://devblogs.microsoft.com/foundry/introducing-microsoft-agent-framework-the-open-source-engine-for-agentic-ai-apps/).
 
-[Unreleased]: https://github.com/microsoft/agent-framework/compare/python-1.0.0b251112...HEAD
+[Unreleased]: https://github.com/microsoft/agent-framework/compare/python-1.0.0b251112.post1...HEAD
+[1.0.0b251112.post1]: https://github.com/microsoft/agent-framework/compare/python-1.0.0b251112...python-1.0.0b251112.post1
 [1.0.0b251112]: https://github.com/microsoft/agent-framework/compare/python-1.0.0b251111...python-1.0.0b251112
 [1.0.0b251111]: https://github.com/microsoft/agent-framework/compare/python-1.0.0b251108...python-1.0.0b251111
 [1.0.0b251108]: https://github.com/microsoft/agent-framework/compare/python-1.0.0b251106.post1...python-1.0.0b251108

python/packages/a2a/pyproject.toml

@@ -4,7 +4,7 @@ description = "A2A integration for Microsoft Agent Framework."
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 license-files = ["LICENSE"]
 urls.homepage = "https://aka.ms/agent-framework"
 urls.source = "https://github.com/microsoft/agent-framework/tree/main/python"

python/packages/ag-ui/agent_framework_ag_ui/_orchestrators.py

@@ -316,43 +316,66 @@ class DefaultOrchestrator(Orchestrator):
                     )
                     continue
 
-                if role_value == "user" and pending_confirm_changes_id:
-                    # Check if this is a confirm_changes response (JSON with "accepted" field)
-                    user_text = ""
-                    for content in msg.contents or []:
-                        if isinstance(content, TextContent):
-                            user_text = content.text
-                            break
+                if role_value == "user":
+                    # Check if this user message is a confirm_changes response (JSON with "accepted" field)
+                    # This must be checked BEFORE injecting synthetic results for pending tool calls
+                    if pending_confirm_changes_id:
+                        user_text = ""
+                        for content in msg.contents or []:
+                            if isinstance(content, TextContent):
+                                user_text = content.text
+                                break
 
-                    try:
-                        parsed = json.loads(user_text)
-                        if "accepted" in parsed:
-                            # This is a confirm_changes response - inject synthetic tool result
-                            logger.info(
-                                f"Injecting synthetic tool result for confirm_changes call_id={pending_confirm_changes_id}"
-                            )
+                        try:
+                            parsed = json.loads(user_text)
+                            if "accepted" in parsed:
+                                # This is a confirm_changes response - inject synthetic tool result
+                                logger.info(
+                                    f"Injecting synthetic tool result for confirm_changes call_id={pending_confirm_changes_id}"
+                                )
+                                synthetic_result = ChatMessage(
+                                    role="tool",
+                                    contents=[
+                                        FunctionResultContent(
+                                            call_id=pending_confirm_changes_id,
+                                            result="Confirmed" if parsed.get("accepted") else "Rejected",
+                                        )
+                                    ],
+                                )
+                                sanitized.append(synthetic_result)
+                                if pending_tool_call_ids:
+                                    pending_tool_call_ids.discard(pending_confirm_changes_id)
+                                pending_confirm_changes_id = None
+                                # Don't add the user message to sanitized - it's been converted to tool result
+                                continue
+                        except (json.JSONDecodeError, KeyError) as e:
+                            # Failed to parse user message as confirm_changes response; continue normal processing
+                            logger.debug(f"Could not parse user message as confirm_changes response: {e}")
+
+                    # Before processing user message, check if there are pending tool calls without results
+                    # This happens when assistant made multiple tool calls but only some got results
+                    # This is checked AFTER confirm_changes special handling above
+                    if pending_tool_call_ids:
+                        logger.info(
+                            f"User message arrived with {len(pending_tool_call_ids)} pending tool calls - injecting synthetic results"
+                        )
+                        for pending_call_id in pending_tool_call_ids:
+                            logger.info(f"Injecting synthetic tool result for pending call_id={pending_call_id}")
                             synthetic_result = ChatMessage(
                                 role="tool",
                                 contents=[
                                     FunctionResultContent(
-                                        call_id=pending_confirm_changes_id,
-                                        result="Confirmed" if parsed.get("accepted") else "Rejected",
+                                        call_id=pending_call_id,
+                                        result="Tool execution skipped - user provided follow-up message",
                                     )
                                 ],
                             )
                             sanitized.append(synthetic_result)
-                            if pending_tool_call_ids:
-                                pending_tool_call_ids.discard(pending_confirm_changes_id)
-                            pending_confirm_changes_id = None
-                            # Don't add the user message to sanitized - it's been converted to tool result
-                            continue
-                    except (json.JSONDecodeError, KeyError) as e:
-                        # Failed to parse user message as confirm_changes response; continue normal processing
-                        logger.debug(f"Could not parse user message as confirm_changes response: {e}")
+                        pending_tool_call_ids = None
+                        pending_confirm_changes_id = None
 
-                    # Not a confirm_changes response, continue normal processing
+                    # Normal user message processing
                     sanitized.append(msg)
-                    pending_tool_call_ids = None
                     pending_confirm_changes_id = None
                     continue
 
@@ -365,6 +388,14 @@ class DefaultOrchestrator(Orchestrator):
                             call_id = str(content.call_id)
                             if call_id in pending_tool_call_ids:
                                 keep = True
+                                # Note: We do NOT remove call_id from pending here.
+                                # This allows duplicate tool results to pass through sanitization
+                                # so the deduplicator can choose the best one (prefer non-empty results).
+                                # We only clear pending_tool_call_ids when a user message arrives.
+                                if call_id == pending_confirm_changes_id:
+                                    # For confirm_changes specifically, we do want to clear it
+                                    # since we only expect one response
+                                    pending_confirm_changes_id = None
                                 break
                     if keep:
                         sanitized.append(msg)

python/packages/ag-ui/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agent-framework-ag-ui"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 description = "AG-UI protocol integration for Agent Framework"
 readme = "README.md"
 license-files = ["LICENSE"]

python/packages/anthropic/pyproject.toml

@@ -4,7 +4,7 @@ description = "Anthropic integration for Microsoft Agent Framework."
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 license-files = ["LICENSE"]
 urls.homepage = "https://aka.ms/agent-framework"
 urls.source = "https://github.com/microsoft/agent-framework/tree/main/python"

python/packages/azure-ai/pyproject.toml

@@ -4,7 +4,7 @@ description = "Azure AI Foundry integration for Microsoft Agent Framework."
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 license-files = ["LICENSE"]
 urls.homepage = "https://aka.ms/agent-framework"
 urls.source = "https://github.com/microsoft/agent-framework/tree/main/python"

python/packages/azurefunctions/pyproject.toml

@@ -4,7 +4,7 @@ description = "Azure Functions integration for Microsoft Agent Framework."
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 license-files = ["LICENSE"]
 urls.homepage = "https://aka.ms/agent-framework"
 urls.source = "https://github.com/microsoft/agent-framework/tree/main/python"

python/packages/chatkit/pyproject.toml

@@ -4,7 +4,7 @@ description = "OpenAI ChatKit integration for Microsoft Agent Framework."
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 license-files = ["LICENSE"]
 urls.homepage = "https://aka.ms/agent-framework"
 urls.source = "https://github.com/microsoft/agent-framework/tree/main/python"

python/packages/copilotstudio/pyproject.toml

@@ -4,7 +4,7 @@ description = "Copilot Studio integration for Microsoft Agent Framework."
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 license-files = ["LICENSE"]
 urls.homepage = "https://aka.ms/agent-framework"
 urls.source = "https://github.com/microsoft/agent-framework/tree/main/python"

python/packages/core/pyproject.toml

@@ -4,7 +4,7 @@ description = "Microsoft Agent Framework for building AI Agents with Python. Thi
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 license-files = ["LICENSE"]
 urls.homepage = "https://aka.ms/agent-framework"
 urls.source = "https://github.com/microsoft/agent-framework/tree/main/python"

python/packages/devui/agent_framework_devui/_executor.py

@@ -781,6 +781,27 @@ class AgentFrameworkExecutor:
         Returns:
             Dict of {request_id: response_value} if found, None otherwise
         """
+        # Handle case where input_data might be a JSON string (from streamWorkflowExecutionOpenAI)
+        # The input field type is: str | list[Any] | dict[str, Any]
+        if isinstance(input_data, str):
+            try:
+                parsed = json.loads(input_data)
+                # Only use parsed value if it's a list (ResponseInputParam format expected for HIL)
+                if isinstance(parsed, list):
+                    input_data = parsed
+                else:
+                    # Parsed to dict, string, or primitive - not HIL response format
+                    return None
+            except (json.JSONDecodeError, TypeError):
+                # Plain text string, not valid JSON - not HIL format
+                return None
+
+        # At this point, input_data should be a list or dict
+        # HIL responses are always in list format (ResponseInputParam)
+        if isinstance(input_data, dict):
+            # This is structured workflow input (dict), not HIL responses
+            return None
+
         if not isinstance(input_data, list):
             return None
 

python/packages/devui/pyproject.toml

@@ -4,7 +4,7 @@ description = "Debug UI for Microsoft Agent Framework with OpenAI-compatible API
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 license-files = ["LICENSE"]
 urls.homepage = "https://github.com/microsoft/agent-framework"
 urls.source = "https://github.com/microsoft/agent-framework/tree/main/python"

python/packages/devui/tests/test_execution.py

@@ -261,6 +261,27 @@ def test_executor_parse_stringified_json_workflow_input():
     assert parsed.metadata == {"key": "value"}
 
 
+def test_extract_workflow_hil_responses_handles_stringified_json():
+    """Test HIL response extraction handles both stringified and parsed JSON (regression test)."""
+    from agent_framework_devui._discovery import EntityDiscovery
+    from agent_framework_devui._executor import AgentFrameworkExecutor
+    from agent_framework_devui._mapper import MessageMapper
+
+    executor = AgentFrameworkExecutor(EntityDiscovery(None), MessageMapper())
+
+    # Regression test: Frontend sends stringified JSON via streamWorkflowExecutionOpenAI
+    stringified = '[{"type":"message","content":[{"type":"workflow_hil_response","responses":{"req_1":"spam"}}]}]'
+    assert executor._extract_workflow_hil_responses(stringified) == {"req_1": "spam"}
+
+    # Ensure parsed format still works
+    parsed = [{"type": "message", "content": [{"type": "workflow_hil_response", "responses": {"req_2": "ham"}}]}]
+    assert executor._extract_workflow_hil_responses(parsed) == {"req_2": "ham"}
+
+    # Non-HIL inputs should return None
+    assert executor._extract_workflow_hil_responses("plain text") is None
+    assert executor._extract_workflow_hil_responses({"email": "test"}) is None
+
+
 async def test_executor_handles_non_streaming_agent():
     """Test executor can handle agents with only run() method (no run_stream)."""
     from agent_framework import AgentRunResponse, AgentThread, ChatMessage, Role, TextContent

python/packages/devui/tests/test_server.py

@@ -280,18 +280,14 @@ async def test_api_restrictions_in_user_mode():
     assert dev_client.get("/v1/entities").status_code == 200
     assert user_client.get("/v1/entities").status_code == 200
 
-    # Test 4: Entity info should be restricted in user mode
+    # Test 4: Entity info should be accessible in both modes (UI needs this)
     dev_response = dev_client.get("/v1/entities/test_agent/info")
     assert dev_response.status_code in [200, 404, 500]  # Not 403
 
     user_response = user_client.get("/v1/entities/test_agent/info")
-    assert user_response.status_code == 403
-    error_data = user_response.json()
-    # FastAPI wraps HTTPException detail in 'detail' field
-    error = error_data.get("detail", {}).get("error") or error_data.get("error")
-    assert error is not None
-    assert "developer mode" in error["message"].lower()
-    assert error["code"] == "developer_mode_required"
+    # Should return 404 (entity doesn't exist) or 500 (other error), but NOT 403 (forbidden)
+    # User mode needs entity info to display workflows/agents in the UI
+    assert user_response.status_code in [200, 404, 500]  # Not 403
 
     # Test 5: Hot reload should be restricted in user mode
     dev_response = dev_client.post("/v1/entities/test_agent/reload")
@@ -329,10 +325,11 @@ async def test_api_restrictions_in_user_mode():
     # Test 8: Chat endpoint should work in both modes
     chat_payload = {"model": "test_agent", "input": "Hello"}
     dev_response = dev_client.post("/v1/responses", json=chat_payload)
-    assert dev_response.status_code in [200, 404]  # 404 if agent doesn't exist
+    # 200=success, 400=missing entity_id in metadata, 404=entity not found
+    assert dev_response.status_code in [200, 400, 404]
 
     user_response = user_client.post("/v1/responses", json=chat_payload)
-    assert user_response.status_code in [200, 404]
+    assert user_response.status_code in [200, 400, 404]
 
 
 if __name__ == "__main__":

python/packages/lab/pyproject.toml

@@ -4,7 +4,7 @@ description = "Experimental modules for Microsoft Agent Framework"
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 license-files = ["LICENSE"]
 urls.homepage = "https://aka.ms/agent-framework"
 urls.source = "https://github.com/microsoft/agent-framework/tree/main/python"

python/packages/mem0/pyproject.toml

@@ -4,7 +4,7 @@ description = "Mem0 integration for Microsoft Agent Framework."
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 license-files = ["LICENSE"]
 urls.homepage = "https://aka.ms/agent-framework"
 urls.source = "https://github.com/microsoft/agent-framework/tree/main/python"

python/packages/purview/pyproject.toml

@@ -4,7 +4,7 @@ description = "Microsoft Purview (Graph dataSecurityAndGovernance) integration f
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 license-files = ["LICENSE"]
 urls.homepage = "https://github.com/microsoft/agent-framework"
 urls.source = "https://github.com/microsoft/agent-framework/tree/main/python"

python/packages/redis/pyproject.toml

@@ -4,7 +4,7 @@ description = "Redis integration for Microsoft Agent Framework."
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 license-files = ["LICENSE"]
 urls.homepage = "https://aka.ms/agent-framework"
 urls.source = "https://github.com/microsoft/agent-framework/tree/main/python"

python/pyproject.toml

@@ -4,7 +4,7 @@ description = "Microsoft Agent Framework for building AI Agents with Python. Thi
 authors = [{ name = "Microsoft", email = "af-support@microsoft.com"}]
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.0.0b251112"
+version = "1.0.0b251112.post1"
 license-files = ["LICENSE"]
 urls.homepage = "https://aka.ms/agent-framework"
 urls.source = "https://github.com/microsoft/agent-framework/tree/main/python"

python/samples/getting_started/devui/weather_agent_azure/agent.py

@@ -3,7 +3,7 @@
 
 import logging
 import os
-from collections.abc import Awaitable, Callable
+from collections.abc import AsyncIterable, Awaitable, Callable
 from typing import Annotated
 
 from agent_framework import (
@@ -11,8 +11,10 @@ from agent_framework import (
     ChatContext,
     ChatMessage,
     ChatResponse,
+    ChatResponseUpdate,
     FunctionInvocationContext,
     Role,
+    TextContent,
     chat_middleware,
     function_middleware,
     ai_function
@@ -37,28 +39,42 @@ async def security_filter_middleware(
     next: Callable[[ChatContext], Awaitable[None]],
 ) -> None:
     """Chat middleware that blocks requests containing sensitive information."""
-    # Block requests with sensitive information
     blocked_terms = ["password", "secret", "api_key", "token"]
 
-    for message in context.messages:
-        if message.text:
-            message_lower = message.text.lower()
-            for term in blocked_terms:
-                if term in message_lower:
-                    # Override the response without calling the LLM
+    # Check only the last message (most recent user input)
+    last_message = context.messages[-1] if context.messages else None
+    if last_message and last_message.role == Role.USER and last_message.text:
+        message_lower = last_message.text.lower()
+        for term in blocked_terms:
+            if term in message_lower:
+                error_message = (
+                    "I cannot process requests containing sensitive information. "
+                    "Please rephrase your question without including passwords, secrets, "
+                    "or other sensitive data."
+                )
+
+                if context.is_streaming:
+                    # Streaming mode: return async generator
+                    async def blocked_stream() -> AsyncIterable[ChatResponseUpdate]:
+                        yield ChatResponseUpdate(
+                            contents=[TextContent(text=error_message)],
+                            role=Role.ASSISTANT,
+                        )
+
+                    context.result = blocked_stream()
+                else:
+                    # Non-streaming mode: return complete response
                     context.result = ChatResponse(
                         messages=[
                             ChatMessage(
                                 role=Role.ASSISTANT,
-                                text=(
-                                    "I cannot process requests containing sensitive information. "
-                                    "Please rephrase your question without including passwords, secrets, "
-                                    "or other sensitive data."
-                                ),
+                                text=error_message,
                             )
                         ]
                     )
-                    return
+
+                context.terminate = True
+                return
 
     await next(context)