Python: [BREAKING] update context provider APIs, middleware, and per-service-call history persistence

python/packages/a2a/agent_framework_a2a/_agent.py

@@ -35,9 +35,9 @@
     AgentResponseUpdate,
     AgentSession,
     BaseAgent,
-    BaseHistoryProvider,
     Content,
     ContinuationToken,
+    HistoryProvider,
     Message,
     ResponseStream,
     SessionContext,
@@ -353,7 +353,7 @@ async def _map_a2a_stream(
 
         # Run before_run providers (forward order)
         for provider in self.context_providers:
-            if isinstance(provider, BaseHistoryProvider) and not provider.load_messages:
+            if isinstance(provider, HistoryProvider) and not provider.load_messages:
                 continue
             if session is None:
                 raise RuntimeError("Provider session must be available when context providers are configured.")

python/packages/a2a/tests/test_a2a_agent.py

@@ -24,8 +24,8 @@
     AgentResponse,
     AgentResponseUpdate,
     AgentSession,
-    BaseContextProvider,
     Content,
+    ContextProvider,
     Message,
     SessionContext,
 )
@@ -869,7 +869,7 @@ async def test_poll_task_completed(a2a_agent: A2AAgent, mock_a2a_client: MockA2A
 # region Context Provider Tests
 
 
-class TrackingContextProvider(BaseContextProvider):
+class TrackingContextProvider(ContextProvider):
     """A context provider that records when before_run and after_run are called."""
 
     def __init__(self) -> None:

python/packages/azure-ai-search/agent_framework_azure_ai_search/_context_provider.py

@@ -1,9 +1,9 @@
 # Copyright (c) Microsoft. All rights reserved.
 
-"""New-pattern Azure AI Search context provider using BaseContextProvider.
+"""New-pattern Azure AI Search context provider using ContextProvider.
 
 This module provides ``AzureAISearchContextProvider``, built on the new
-:class:`BaseContextProvider` hooks pattern.
+:class:`ContextProvider` hooks pattern.
 """
 
 from __future__ import annotations
@@ -17,8 +17,8 @@
     AGENT_FRAMEWORK_USER_AGENT,
     AgentSession,
     Annotation,
-    BaseContextProvider,
     Content,
+    ContextProvider,
     Message,
     SecretString,
     SessionContext,
@@ -154,8 +154,8 @@ class AzureAISearchSettings(TypedDict, total=False):
     api_key: SecretString | None
 
 
-class AzureAISearchContextProvider(BaseContextProvider):
-    """Azure AI Search context provider using the new BaseContextProvider hooks pattern.
+class AzureAISearchContextProvider(ContextProvider):
+    """Azure AI Search context provider using the new ContextProvider hooks pattern.
 
     Retrieves relevant context from Azure AI Search using semantic or agentic search
     modes.

python/packages/azure-cosmos/agent_framework_azure_cosmos/_history_provider.py

@@ -11,7 +11,7 @@
 from typing import Any, ClassVar, TypedDict
 
 from agent_framework import AGENT_FRAMEWORK_USER_AGENT, Message
-from agent_framework._sessions import BaseHistoryProvider
+from agent_framework._sessions import HistoryProvider
 from agent_framework._settings import SecretString, load_settings
 from azure.core.credentials import TokenCredential
 from azure.core.credentials_async import AsyncTokenCredential
@@ -32,8 +32,8 @@ class AzureCosmosHistorySettings(TypedDict, total=False):
     key: SecretString | None
 
 
-class CosmosHistoryProvider(BaseHistoryProvider):
-    """Azure Cosmos DB-backed history provider using BaseHistoryProvider hooks."""
+class CosmosHistoryProvider(HistoryProvider):
+    """Azure Cosmos DB-backed history provider using HistoryProvider hooks."""
 
     DEFAULT_SOURCE_ID: ClassVar[str] = "azure_cosmos_history"
     _BATCH_OPERATION_LIMIT: ClassVar[int] = 100

python/packages/claude/agent_framework_claude/_agent.py

@@ -16,8 +16,8 @@
     AgentRunInputs,
     AgentSession,
     BaseAgent,
-    BaseContextProvider,
     Content,
+    ContextProvider,
     FunctionTool,
     Message,
     ResponseStream,
@@ -223,7 +223,7 @@ def __init__(
         id: str | None = None,
         name: str | None = None,
         description: str | None = None,
-        context_providers: Sequence[BaseContextProvider] | None = None,
+        context_providers: Sequence[ContextProvider] | None = None,
         middleware: Sequence[AgentMiddlewareTypes] | None = None,
         tools: ToolTypes | Callable[..., Any] | str | Sequence[ToolTypes | Callable[..., Any] | str] | None = None,
         default_options: OptionsT | MutableMapping[str, Any] | None = None,

python/packages/copilotstudio/agent_framework_copilotstudio/_agent.py

@@ -11,8 +11,8 @@
     AgentResponseUpdate,
     AgentSession,
     BaseAgent,
-    BaseContextProvider,
     Content,
+    ContextProvider,
     Message,
     ResponseStream,
     normalize_messages,
@@ -60,7 +60,7 @@ def __init__(
         id: str | None = None,
         name: str | None = None,
         description: str | None = None,
-        context_providers: Sequence[BaseContextProvider] | None = None,
+        context_providers: Sequence[ContextProvider] | None = None,
         middleware: list[AgentMiddlewareTypes] | None = None,
         environment_id: str | None = None,
         agent_identifier: str | None = None,

python/packages/core/AGENTS.md

@@ -61,16 +61,16 @@ agent_framework/
 
 - **`AgentSession`** - Manages conversation state and session metadata
 - **`SessionContext`** - Context object for session-scoped data during agent runs
-- **`BaseContextProvider`** - Base class for context providers (RAG, memory systems)
-- **`BaseHistoryProvider`** - Base class for conversation history storage
+- **`ContextProvider`** - Base class for context providers (RAG, memory systems)
+- **`HistoryProvider`** - Base class for conversation history storage
 
 ### Skills (`_skills.py`)
 
 - **`Skill`** - A skill definition bundling instructions (`content`) with metadata, resources, and scripts. Supports `@skill.resource` and `@skill.script` decorators for adding components.
 - **`SkillResource`** - Named supplementary content attached to a skill; holds either static `content` or a dynamic `function` (sync or async). Exactly one must be provided.
 - **`SkillScript`** - An executable script attached to a skill; holds either an inline `function` (code-defined, runs in-process) or a `path` to a file on disk (file-based, delegated to a runner). Exactly one must be provided.
 - **`SkillScriptRunner`** - Protocol for file-based script execution. Any callable matching `(skill, script, args) -> Any` satisfies it. Code-defined scripts do not use a runner.
-- **`SkillsProvider`** - Context provider (extends `BaseContextProvider`) that discovers file-based skills from `SKILL.md` files and/or accepts code-defined `Skill` instances. Follows progressive disclosure: advertise → load → read resources / run scripts.
+- **`SkillsProvider`** - Context provider (extends `ContextProvider`) that discovers file-based skills from `SKILL.md` files and/or accepts code-defined `Skill` instances. Follows progressive disclosure: advertise → load → read resources / run scripts.
 
 ### Workflows (`_workflows/`)
 

python/packages/core/agent_framework/__init__.py

@@ -102,8 +102,10 @@
 )
 from ._sessions import (
     AgentSession,
-    BaseContextProvider,
-    BaseHistoryProvider,
+    BaseContextProvider,  # type: ignore[reportDeprecated]
+    BaseHistoryProvider,  # type: ignore[reportDeprecated]
+    ContextProvider,
+    HistoryProvider,
     InMemoryHistoryProvider,
     SessionContext,
     register_state_type,
@@ -296,6 +298,7 @@
     "CompactionProvider",
     "CompactionStrategy",
     "Content",
+    "ContextProvider",
     "ContinuationToken",
     "ConversationSplit",
     "ConversationSplitter",
@@ -331,6 +334,7 @@
     "FunctionTool",
     "GeneratedEmbeddings",
     "GraphConnectivityError",
+    "HistoryProvider",
     "InMemoryCheckpointStorage",
     "InMemoryHistoryProvider",
     "InProcRunnerContext",