wagent-framework 2.0.0a2__tar.gz → 2.0.0a3__tar.gz

{wagent_framework-2.0.0a2 → wagent_framework-2.0.0a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wagent-framework
-Version: 2.0.0a2
+Version: 2.0.0a3
 Summary: Open, composable Python framework for building agents
 Home-page: https://github.com/LuckyStar2456/W-Agent-FrameWork
 Author: LuckyStar2456
@@ -73,7 +73,7 @@ Dynamic: summary
 
 W-Agent 是一个面向本地开发者的 Python 开源 Agent 开发框架。它的目标不是提供托管平台或固定 Harness，而是提供稳定、可扩展的协议与可自由装配的模块，让开发者能够替换模型、路由、Agent Loop、Workflow、工具、状态、沙箱和界面实现。
 
-当前稳定发布版本是 `1.5.2`，最新 Alpha 为 `2.0.0a2`。1.x 工程底座继续保留，微内核、模型、工具、单 Agent 与本地 Workflow 基础已经实现，其余下一代能力按路线图分阶段交付。文档使用明确状态标记，避免把规划能力描述为现有能力。
+当前稳定发布版本是 `1.5.2`，最新 Alpha 为 `2.0.0a2`，仓库主线为 `2.0.0a3` 开发版。1.x 工程底座继续保留，微内核、模型、工具、单 Agent 与本地 Workflow 基础已经实现，其余下一代能力按路线图分阶段交付。文档使用明确状态标记，避免把规划能力描述为现有能力。
 
 ## 状态标记
 
@@ -109,7 +109,7 @@ W-Agent 遵循以下原则：
 - Skill 加载、签名校验、MCP JWT 认证、Redis 分布式锁。
 - LangChain 工具适配、FastAPI 示例集成和测试辅助设施。
 
-以下 Phase 1 能力在当前 `2.0.0a2` 源码中为 `Implemented`：
+以下 Phase 1 能力在当前 `2.0.0a3` 源码中为 `Implemented`：
 
 - `PluginSpec`、装饰器、YAML 引用与 Python entry point 发现。
 - 统一、版本感知、分作用域的能力注册表与不可变快照。
@@ -175,7 +175,7 @@ pip install "wagent-framework[wasm]"
 pip install "wagent-framework[tui]"
 ```
 
-PyPI 1.x 支持 Python 3.9+；`2.0.0a2` 与后续 2.x Alpha 要求 Python 3.11+。
+PyPI 1.x 支持 Python 3.9+；`2.0.0a2`、当前 `2.0.0a3` 源码与后续 2.x Alpha 要求 Python 3.11+。
 
 ## 1.x 最小示例
 
@@ -221,7 +221,7 @@ wagent run "hello" --confirm-model-call --json
 wagent evaluate cases.json --confirm-model-call --report report.json
 ```
 
-CLI 和 TUI 只调用公开 Python API。当前 CLI/TUI 基础标记为 `Experimental`：已覆盖初始化、模板列表、安全/主动端点探测、装配管理/离线预览、本地 Session 生命周期、需逐次确认的配置化 Agent 运行与 Token 汇总、Agent Checkpoint 脱敏列表，以及 CLI 的 Catalog 工具选择、独立代码加载确认、权限授予、精确 Call ID 审批恢复和 CLI/TUI 隐私安全本地评测；TUI 工具批准执行、通用插件操作、Workflow Checkpoint 汇总和实时事件查看仍为 `Planned`。
+CLI 和 TUI 只调用公开 Python API。当前 CLI/TUI 基础标记为 `Experimental`：已覆盖初始化、模板列表、安全/主动端点探测、装配管理/离线预览、本地 Session 生命周期、需逐次确认的配置化 Agent 运行与 Token 汇总、Agent Checkpoint 脱敏列表、Catalog 工具选择、独立代码加载确认、权限授予、精确 Call ID 审批恢复、脱敏实时 RunEvent，以及 CLI/TUI 隐私安全本地评测；通用插件操作和 Workflow Checkpoint 汇总仍为 `Planned`。
 
 ## 工程装配分享
 

{wagent_framework-2.0.0a2 → wagent_framework-2.0.0a3}/README.md

@@ -4,7 +4,7 @@
 
 W-Agent 是一个面向本地开发者的 Python 开源 Agent 开发框架。它的目标不是提供托管平台或固定 Harness，而是提供稳定、可扩展的协议与可自由装配的模块，让开发者能够替换模型、路由、Agent Loop、Workflow、工具、状态、沙箱和界面实现。
 
-当前稳定发布版本是 `1.5.2`，最新 Alpha 为 `2.0.0a2`。1.x 工程底座继续保留，微内核、模型、工具、单 Agent 与本地 Workflow 基础已经实现，其余下一代能力按路线图分阶段交付。文档使用明确状态标记，避免把规划能力描述为现有能力。
+当前稳定发布版本是 `1.5.2`，最新 Alpha 为 `2.0.0a2`，仓库主线为 `2.0.0a3` 开发版。1.x 工程底座继续保留，微内核、模型、工具、单 Agent 与本地 Workflow 基础已经实现，其余下一代能力按路线图分阶段交付。文档使用明确状态标记，避免把规划能力描述为现有能力。
 
 ## 状态标记
 
@@ -40,7 +40,7 @@ W-Agent 遵循以下原则：
 - Skill 加载、签名校验、MCP JWT 认证、Redis 分布式锁。
 - LangChain 工具适配、FastAPI 示例集成和测试辅助设施。
 
-以下 Phase 1 能力在当前 `2.0.0a2` 源码中为 `Implemented`：
+以下 Phase 1 能力在当前 `2.0.0a3` 源码中为 `Implemented`：
 
 - `PluginSpec`、装饰器、YAML 引用与 Python entry point 发现。
 - 统一、版本感知、分作用域的能力注册表与不可变快照。
@@ -106,7 +106,7 @@ pip install "wagent-framework[wasm]"
 pip install "wagent-framework[tui]"
 ```
 
-PyPI 1.x 支持 Python 3.9+；`2.0.0a2` 与后续 2.x Alpha 要求 Python 3.11+。
+PyPI 1.x 支持 Python 3.9+；`2.0.0a2`、当前 `2.0.0a3` 源码与后续 2.x Alpha 要求 Python 3.11+。
 
 ## 1.x 最小示例
 
@@ -152,7 +152,7 @@ wagent run "hello" --confirm-model-call --json
 wagent evaluate cases.json --confirm-model-call --report report.json
 ```
 
-CLI 和 TUI 只调用公开 Python API。当前 CLI/TUI 基础标记为 `Experimental`：已覆盖初始化、模板列表、安全/主动端点探测、装配管理/离线预览、本地 Session 生命周期、需逐次确认的配置化 Agent 运行与 Token 汇总、Agent Checkpoint 脱敏列表，以及 CLI 的 Catalog 工具选择、独立代码加载确认、权限授予、精确 Call ID 审批恢复和 CLI/TUI 隐私安全本地评测；TUI 工具批准执行、通用插件操作、Workflow Checkpoint 汇总和实时事件查看仍为 `Planned`。
+CLI 和 TUI 只调用公开 Python API。当前 CLI/TUI 基础标记为 `Experimental`：已覆盖初始化、模板列表、安全/主动端点探测、装配管理/离线预览、本地 Session 生命周期、需逐次确认的配置化 Agent 运行与 Token 汇总、Agent Checkpoint 脱敏列表、Catalog 工具选择、独立代码加载确认、权限授予、精确 Call ID 审批恢复、脱敏实时 RunEvent，以及 CLI/TUI 隐私安全本地评测；通用插件操作和 Workflow Checkpoint 汇总仍为 `Planned`。
 
 ## 工程装配分享
 

{wagent_framework-2.0.0a2 → wagent_framework-2.0.0a3}/setup.py

@@ -8,7 +8,7 @@ with open(os.path.join(here, "README.md"), "r", encoding="utf-8") as f:
 
 setup(
     name="wagent-framework",
-    version="2.0.0a2",
+    version="2.0.0a3",
     description="Open, composable Python framework for building agents",
     long_description=long_description,
     long_description_content_type="text/markdown",

{wagent_framework-2.0.0a2 → wagent_framework-2.0.0a3}/tests/test_cli.py

@@ -25,7 +25,7 @@ def test_cli_version_and_profile_json_are_machine_readable():
     profiles = runner.invoke(app, ["profile", "list", "--json"])
 
     assert version.exit_code == 0
-    assert "2.0.0a2" in version.stdout
+    assert "2.0.0a3" in version.stdout
     assert profiles.exit_code == 0
     assert [item["key"] for item in json.loads(profiles.stdout)] == [
         "customer-support",

{wagent_framework-2.0.0a2 → wagent_framework-2.0.0a3}/tests/test_local_runtime.py

@@ -97,6 +97,11 @@ def _templates(captured):
 @pytest.mark.asyncio
 async def test_local_runtime_assembles_full_text_run_and_persists_session(tmp_path):
     captured = {}
+    events = []
+
+    async def record_event(event):
+        events.append(event)
+
     runtime = assemble_local_runtime(
         _config(),
         tmp_path / ".wagent",
@@ -104,9 +109,20 @@ async def test_local_runtime_assembles_full_text_run_and_persists_session(tmp_pa
         environ={"TEST_MODEL_KEY": "not-persisted"},
     )
 
-    run = await runtime.run("hi", session_title="Configured run")
+    run = await runtime.run(
+        "hi",
+        session_title="Configured run",
+        event_callback=record_event,
+    )
 
     assert run.result.output == "hello"
+    assert [event.type.value for event in events] == [
+        "run-started",
+        "model-started",
+        "model-completed",
+        "token-usage",
+        "run-completed",
+    ]
     assert run.result.usage == TokenUsage(3, 2)
     assert run.result.usage_complete is True
     assert len(run.result.attempts) == 1
@@ -393,17 +409,21 @@ async def test_local_runtime_selects_catalog_tools_and_resumes_approval(tmp_path
     assert pending.result.pending_tool_call.id == "save-1"
     assert writes == []
 
+    resumed_events = []
     completed = await runtime.resume(
         pending.session.session_id,
         pending.result.run_id,
         permissions=frozenset({"notes.write"}),
         approved_call_ids=frozenset({"save-1"}),
+        event_callback=resumed_events.append,
     )
 
     assert completed.result.output == "saved"
     assert completed.result.stop_reason.value == "completed"
     assert writes == ["value"]
     assert completed.result.usage == TokenUsage(7, 2)
+    assert resumed_events[0].type.value == "run-resumed"
+    assert resumed_events[-1].type.value == "run-completed"
 
 
 def test_local_runtime_tool_selection_requires_budget_and_authorized_catalog(tmp_path):

{wagent_framework-2.0.0a2 → wagent_framework-2.0.0a3}/tests/test_sessions.py

@@ -132,6 +132,17 @@ async def test_session_resume_updates_existing_run_without_duplicate_input(tmp_p
         run_id="run-approval",
     )
 
+    with pytest.raises(SessionError, match="streamed approval resume"):
+        await manager.resume_agent(
+            loop,
+            "approval-1",
+            "run-approval",
+            tool_context=ToolExecutionContext(
+                approved_call_ids=frozenset({"call-1"})
+            ),
+            event_callback=lambda event: None,
+        )
+
     resumed = await manager.resume_agent(
         loop,
         "approval-1",

{wagent_framework-2.0.0a2 → wagent_framework-2.0.0a3}/tests/test_tui.py

@@ -12,6 +12,8 @@ from w_agent import (
     ModelDescriptor,
     ModelMessage,
     ModelCost,
+    RunEvent,
+    RunEventType,
     RunResult,
     StopReason,
     TokenUsage,
@@ -109,6 +111,185 @@ async def test_tui_run_requires_explicit_confirmation_before_config_or_network(
         assert "config" in str(app.query_one("#run-result").content).lower()
 
 
+@pytest.mark.asyncio
+async def test_tui_tool_code_requires_separate_import_confirmation(
+    tmp_path,
+    monkeypatch,
+):
+    loaded = []
+    monkeypatch.setattr(
+        tui_module,
+        "load_tool_entries",
+        lambda entries: loaded.append(entries) or {},
+    )
+    app = WAgentTui(tmp_path)
+
+    async with app.run_test(size=(140, 65)) as pilot:
+        app.query_one(TabbedContent).active = "run"
+        await pilot.pause()
+        app.query_one("#run-prompt").value = "hello"
+        app.query_one("#run-tool-entries").value = "my_tools:bindings"
+        app.query_one("#run-confirm").value = "RUN"
+        await pilot.click("#run-button")
+        await pilot.pause()
+
+        assert loaded == []
+        assert "type LOAD TOOLS" in str(app.query_one("#run-result").content)
+
+
+@pytest.mark.asyncio
+async def test_tui_projects_live_events_without_prompt_or_arguments(
+    tmp_path,
+    monkeypatch,
+):
+    class Runtime:
+        closed = False
+
+        async def __aenter__(self):
+            return self
+
+        async def __aexit__(self, *exc_info):
+            self.closed = True
+
+        async def run(self, prompt, **kwargs):
+            assert prompt == "SECRET_PROMPT"
+            assert kwargs["permissions"] == frozenset({"notes.write"})
+            await kwargs["event_callback"](
+                RunEvent(
+                    1,
+                    RunEventType.TOOL_REQUESTED,
+                    "run-live",
+                    {
+                        "step": 1,
+                        "call_id": "call-1",
+                        "name": "save_note",
+                        "arguments": {"text": "SECRET_ARGUMENT"},
+                        "text": "SECRET_OUTPUT",
+                    },
+                    session_id="session-live",
+                )
+            )
+            return SimpleNamespace(
+                session=SimpleNamespace(session_id="session-live"),
+                result=RunResult(
+                    "run-live",
+                    StopReason.COMPLETED,
+                    "done",
+                    (ModelMessage.text(MessageRole.ASSISTANT, "done"),),
+                    (),
+                    steps=1,
+                    tool_calls=1,
+                ),
+            )
+
+    runtime = Runtime()
+    loaded = []
+    monkeypatch.setattr(tui_module, "load_local_runtime_config", lambda path: object())
+    monkeypatch.setattr(
+        tui_module,
+        "load_tool_entries",
+        lambda entries: loaded.append(entries) or {"save_note": object()},
+    )
+    monkeypatch.setattr(
+        tui_module,
+        "assemble_local_runtime",
+        lambda config, state_root, *, tool_bindings: runtime,
+    )
+    app = WAgentTui(tmp_path)
+
+    async with app.run_test(size=(150, 70)) as pilot:
+        app.query_one(TabbedContent).active = "run"
+        await pilot.pause()
+        app.query_one("#run-prompt").value = "SECRET_PROMPT"
+        app.query_one("#run-tool-entries").value = "my_tools:bindings"
+        app.query_one("#run-permissions").value = "notes.write"
+        app.query_one("#run-tool-confirm").value = "LOAD TOOLS"
+        app.query_one("#run-confirm").value = "RUN"
+        await pilot.click("#run-button")
+        await pilot.pause()
+
+        rendered = str(app.query_one("#run-events").content)
+        assert "tool-requested" in rendered
+        assert "call_id=call-1" in rendered
+        assert "SECRET_PROMPT" not in rendered
+        assert "SECRET_ARGUMENT" not in rendered
+        assert "SECRET_OUTPUT" not in rendered
+        assert loaded == [("my_tools:bindings",)]
+        assert runtime.closed is True
+
+
+@pytest.mark.asyncio
+async def test_tui_resumes_exact_approved_call_with_live_events(
+    tmp_path,
+    monkeypatch,
+):
+    class Runtime:
+        async def __aenter__(self):
+            return self
+
+        async def __aexit__(self, *exc_info):
+            pass
+
+        async def resume(self, session_id, run_id, **kwargs):
+            assert session_id == "session-1"
+            assert run_id == "run-1"
+            assert kwargs["approved_call_ids"] == frozenset({"call-1"})
+            assert kwargs["permissions"] == frozenset({"notes.write"})
+            await kwargs["event_callback"](
+                RunEvent(
+                    2,
+                    RunEventType.RUN_RESUMED,
+                    "run-1",
+                    {"checkpoint_status": "resuming", "pending_call_id": "call-1"},
+                    session_id="session-1",
+                )
+            )
+            return SimpleNamespace(
+                session=SimpleNamespace(session_id="session-1"),
+                result=RunResult(
+                    "run-1",
+                    StopReason.COMPLETED,
+                    "approved",
+                    (ModelMessage.text(MessageRole.ASSISTANT, "approved"),),
+                    (),
+                    steps=2,
+                    tool_calls=1,
+                ),
+            )
+
+    runtime = Runtime()
+    monkeypatch.setattr(tui_module, "load_local_runtime_config", lambda path: object())
+    monkeypatch.setattr(tui_module, "load_tool_entries", lambda entries: {})
+    monkeypatch.setattr(
+        tui_module,
+        "assemble_local_runtime",
+        lambda config, state_root, *, tool_bindings: runtime,
+    )
+    app = WAgentTui(tmp_path)
+
+    async with app.run_test(size=(150, 75)) as pilot:
+        app.query_one(TabbedContent).active = "checkpoints"
+        await pilot.pause()
+        app.query_one("#checkpoint-session").value = "session-1"
+        app.query_one("#checkpoint-run").value = "run-1"
+        app.query_one("#checkpoint-call").value = "call-1"
+        app.query_one("#checkpoint-tool-entries").value = "my_tools:bindings"
+        app.query_one("#checkpoint-permissions").value = "notes.write"
+        app.query_one("#checkpoint-tool-confirm").value = "LOAD TOOLS"
+        app.query_one("#checkpoint-confirm").value = "RESUME"
+        await pilot.click("#checkpoint-resume")
+        await pilot.pause()
+
+        assert "Stop: completed" in str(
+            app.query_one("#checkpoint-resume-result").content
+        )
+        events = str(app.query_one("#checkpoint-events").content)
+        assert "run-resumed" in events
+        assert "pending_call_id=call-1" in events
+        assert app.query_one("#checkpoint-confirm").value == ""
+        assert app.query_one("#checkpoint-tool-confirm").value == ""
+
+
 @pytest.mark.asyncio
 async def test_tui_active_provider_probe_requires_explicit_confirmation(tmp_path):
     app = WAgentTui(tmp_path)

{wagent_framework-2.0.0a2 → wagent_framework-2.0.0a3}/w_agent/__init__.py

@@ -1,6 +1,6 @@
 """W-Agent 框架包"""
 
-__version__ = "2.0.0a2"
+__version__ = "2.0.0a3"
 __author__ = "LuckyStar2456"
 __license__ = "MIT"
 
@@ -117,10 +117,11 @@ from w_agent.sandbox import (
     UnsafeLocalSandboxProvider,
     WorkspaceAccess,
 )
-from w_agent.sessions import (
-    InMemorySessionStore,
-    JsonSessionStore,
-    SessionError,
+from w_agent.sessions import (
+    InMemorySessionStore,
+    JsonSessionStore,
+    RunEventCallback,
+    SessionError,
     SessionManager,
     SessionMessage,
     SessionRecord,
@@ -747,8 +748,9 @@ __all__ = [
     "workflow_resume_tool",
     "workflow_start_tool",
     "InMemorySessionStore",
-    "JsonSessionStore",
-    "SessionError",
+    "JsonSessionStore",
+    "RunEventCallback",
+    "SessionError",
     "SessionManager",
     "SessionMessage",
     "SessionRecord",

{wagent_framework-2.0.0a2 → wagent_framework-2.0.0a3}/w_agent/local_runtime.py

@@ -39,7 +39,12 @@ from w_agent.models import (
     WeightedRoutingPolicy,
     builtin_provider_template_registry,
 )
-from w_agent.sessions import JsonSessionStore, SessionManager, SessionRecord
+from w_agent.sessions import (
+    JsonSessionStore,
+    RunEventCallback,
+    SessionManager,
+    SessionRecord,
+)
 from w_agent.tools import ToolBinding, ToolExecutionContext, ToolExecutor, ToolRegistry
 
 _COMPATIBLE_TEMPLATES = frozenset({"deepseek", "glm", "qwen", "turbo"})
@@ -260,6 +265,7 @@ class LocalAgentRuntime:
         permissions: frozenset[str] = frozenset(),
         approved_call_ids: frozenset[str] = frozenset(),
         cancellation: CancellationToken | None = None,
+        event_callback: RunEventCallback | None = None,
     ) -> LocalRuntimeRun:
         self._ensure_open()
         if not prompt:
@@ -279,6 +285,7 @@ class LocalAgentRuntime:
                 approved_call_ids=approved_call_ids,
                 cancellation=cancellation,
             ),
+            event_callback=event_callback,
         )
         return LocalRuntimeRun(await self.sessions.get(session.session_id), result)
 
@@ -290,6 +297,7 @@ class LocalAgentRuntime:
         permissions: frozenset[str] = frozenset(),
         approved_call_ids: frozenset[str],
         cancellation: CancellationToken | None = None,
+        event_callback: RunEventCallback | None = None,
     ) -> LocalRuntimeRun:
         """Resume one persisted approval checkpoint with explicit authority."""
 
@@ -306,6 +314,7 @@ class LocalAgentRuntime:
                 cancellation=cancellation,
             ),
             cancellation=cancellation,
+            event_callback=event_callback,
         )
         return LocalRuntimeRun(await self.sessions.get(session_id), result)
 

{wagent_framework-2.0.0a2 → wagent_framework-2.0.0a3}/w_agent/sessions.py

@@ -3,11 +3,12 @@
 from __future__ import annotations
 
 import asyncio
+import inspect
 import json
 import math
 import os
 import re
-from collections.abc import Iterable
+from collections.abc import Awaitable, Callable, Iterable
 from dataclasses import dataclass, field, replace
 from datetime import UTC, datetime
 from enum import StrEnum
@@ -17,7 +18,14 @@ from types import MappingProxyType
 from typing import Any, Mapping, Protocol
 from uuid import uuid4
 
-from w_agent.agents import AgentDefinition, AgentLoop, RunContext, RunResult
+from w_agent.agents import (
+    AgentDefinition,
+    AgentExecution,
+    AgentLoop,
+    RunContext,
+    RunEvent,
+    RunResult,
+)
 from w_agent.kernel import ScopePath
 from w_agent.models import (
     CancellationToken,
@@ -128,6 +136,9 @@ class ResumableAgentLoop(Protocol):
     ) -> RunResult: ...
 
 
+RunEventCallback = Callable[[RunEvent], Awaitable[None] | None]
+
+
 class InMemorySessionStore:
     def __init__(self) -> None:
         self._sessions: dict[str, SessionRecord] = {}
@@ -276,6 +287,7 @@ class SessionManager:
         cancellation: CancellationToken | None = None,
         tool_context: ToolExecutionContext | None = None,
         metadata: Mapping[str, Any] | None = None,
+        event_callback: RunEventCallback | None = None,
     ) -> RunResult:
         current = tuple(messages)
         if not current:
@@ -283,18 +295,22 @@ class SessionManager:
         session = await self._active(session_id)
         history = await self.conversation(session_id) if include_history else ()
         resolved_run_id = run_id or f"run-{uuid4().hex}"
-        result = await loop.run(
-            definition,
-            RunContext(
-                resolved_run_id,
-                (*history, *current),
-                scope=scope or ScopePath.application(),
-                cancellation=cancellation,
-                tool_context=tool_context or ToolExecutionContext(),
-                session_id=session_id,
-                metadata=metadata or {},
-            ),
+        context = RunContext(
+            resolved_run_id,
+            (*history, *current),
+            scope=scope or ScopePath.application(),
+            cancellation=cancellation,
+            tool_context=tool_context or ToolExecutionContext(),
+            session_id=session_id,
+            metadata=metadata or {},
         )
+        if event_callback is None:
+            result = await loop.run(definition, context)
+        else:
+            result = await _consume_execution(
+                loop.stream(definition, context),
+                event_callback,
+            )
         if result.run_id != resolved_run_id:
             raise SessionError("agent returned a different run id")
         await self._record(session, definition, current, result, append_input=True)
@@ -308,15 +324,31 @@ class SessionManager:
         *,
         tool_context: ToolExecutionContext,
         cancellation: CancellationToken | None = None,
+        event_callback: RunEventCallback | None = None,
     ) -> RunResult:
         session = await self._active(session_id)
         if not any(item.run_id == run_id for item in session.runs):
             raise SessionError("run does not belong to session")
-        result = await loop.resume(
-            run_id,
-            tool_context=tool_context,
-            cancellation=cancellation,
-        )
+        if event_callback is None:
+            result = await loop.resume(
+                run_id,
+                tool_context=tool_context,
+                cancellation=cancellation,
+            )
+        else:
+            resume_stream = getattr(loop, "resume_stream", None)
+            if resume_stream is None:
+                raise SessionError(
+                    "agent loop does not support streamed approval resume"
+                )
+            result = await _consume_execution(
+                resume_stream(
+                    run_id,
+                    tool_context=tool_context,
+                    cancellation=cancellation,
+                ),
+                event_callback,
+            )
         if result.run_id != run_id:
             raise SessionError("resumed agent returned a different run id")
         await self._record(
@@ -386,6 +418,21 @@ class SessionManager:
             )
 
 
+async def _consume_execution(
+    execution: AgentExecution,
+    event_callback: RunEventCallback,
+) -> RunResult:
+    """Consume one public event stream while projecting each event to a host."""
+
+    async for event in execution:
+        callback_result = event_callback(event)
+        if inspect.isawaitable(callback_result):
+            await callback_result
+    if execution.result is None:
+        raise SessionError("agent event stream completed without a result")
+    return execution.result
+
+
 def _project_messages(
     messages: Iterable[ModelMessage],
     run_id: str,

{wagent_framework-2.0.0a2 → wagent_framework-2.0.0a3}/w_agent/tools/mcp_client.py

@@ -63,7 +63,7 @@ class McpInputRequiredError(McpError):
 @dataclass(frozen=True, slots=True)
 class McpClientInfo:
     name: str = "w-agent"
-    version: str = "2.0.0a2"
+    version: str = "2.0.0a3"
 
     def __post_init__(self) -> None:
         if not self.name.strip() or not self.version.strip():