agentengine-sdk-python 0.8.1__py3-none-any.whl → 0.8.2__py3-none-any.whl

ksadk/studio/run_service.py

@@ -3,15 +3,44 @@
 from __future__ import annotations
 
 import asyncio
+import logging
 import time
 from collections.abc import Callable, Mapping
-from dataclasses import dataclass, field
+from dataclasses import asdict, dataclass, field
 from datetime import datetime, timezone
 from typing import Any
 from uuid import uuid4
 
 from ksadk.agui.a2ui_projection import project_a2ui_operations
-from ksadk.events.runtime_event import EventType, RuntimeEvent
+from ksadk.events.canonical import (
+    ContinuationCreated,
+    ContinuationResumed,
+    ErrorInfo,
+    InteractionRequested,
+    InteractionResolved,
+    ItemCompleted,
+    ItemFailed,
+    ItemStarted,
+    ItemUpdated,
+    RunCanceled,
+    RunCompleted,
+    RunFailed,
+    RunInterrupted,
+    RunProgress,
+    RunStarted,
+    RuntimeEvent,
+    SourceRef,
+    UsageReported,
+    dump_runtime_event,
+)
+from ksadk.events.content import (
+    ContentSnapshot,
+    DataContent,
+    TextContent,
+    ToolCallContent,
+    ToolResultContent,
+)
+from ksadk.events.store import RuntimeEventStore
 from ksadk.runtime import (
     CONVERSATION_PREPROCESSING_METADATA_KEY,
     PauseResult,
@@ -21,6 +50,8 @@ from ksadk.runtime import (
     RuntimeLaunchContext,
     StartRequest,
 )
+from ksadk.sessions.base import BaseSessionService
+from ksadk.sessions.local_service import LocalSessionService
 from ksadk.studio.contracts import RunEvent, RunRecord, RunStatus, Usage
 from ksadk.studio.errors import StudioError
 from ksadk.studio.event_store import RunEventStore
@@ -29,6 +60,9 @@ from ksadk.studio.workspace import Workspace
 _CANCEL_TIMEOUT_SECONDS = 2.0
 
 
+logger = logging.getLogger(__name__)
+
+
 @dataclass(frozen=True)
 class StudioRunSpec:
     """Product metadata plus the core launch context for one Studio run."""
@@ -50,15 +84,49 @@ class StudioRunService:
         executor: RuntimeExecutor,
         *,
         event_store: RunEventStore | None = None,
+        session_service: BaseSessionService | None = None,
+        runtime_events: RuntimeEventStore | None = None,
     ) -> None:
         self.workspace = workspace
         self.executor = executor
         self.event_store = event_store or RunEventStore(workspace)
+        self.session_service = session_service or LocalSessionService(
+            project_dir=str(workspace.root)
+        )
+        self.runtime_events = runtime_events or RuntimeEventStore(self.session_service)
         self._active_handles: dict[str, Any] = {}
         self._cancel_flags: dict[str, bool] = {}
         self._control_queues: dict[str, asyncio.Queue[tuple[str, ResumePayload | None]]] = {}
         self._waiting_modes: dict[str, str] = {}
 
+    async def recover_interrupted(self) -> None:
+        """Settle local runs left active across a Studio restart.
+
+        An in-process handle cannot be resumed safely.  Keep its durable event
+        history and record an explicit interruption; lease-backed hosted
+        recovery remains owned by the Kernel composition root.
+        """
+        active = {RunStatus.RUNNING, RunStatus.WAITING_INPUT}
+        for record in self.event_store.list_runs():
+            if record.status not in active:
+                continue
+            record.status = RunStatus.INTERRUPTED
+            record.completed_at = datetime.now(timezone.utc)
+            record.error = {
+                "code": "LOCAL_STUDIO_RESTARTED",
+                "message": "本地 Studio 重启，运行未在本地恢复。",
+            }
+            self.event_store.save(record)
+            self.event_store.append(
+                record.id,
+                "run.interrupted",
+                {"reason": "local_studio_restarted", "recoverable": False},
+            )
+
+    async def events(self, run_id: str, *, after: int = 0) -> list[RunEvent]:
+        """Read the durable Studio event timeline for API/SSE replay."""
+        return self.event_store.events(run_id, after=after)
+
     async def run(
         self,
         spec: StudioRunSpec,
@@ -84,7 +152,9 @@ class StudioRunService:
             goal_objective=str(spec.request_config.get("goal_objective") or ""),
             input=user_input,
         )
+        await self.session_service.create_session(spec.agent_id, "local-user", session)
         self.event_store.create(record)
+        prepared_turn = await self._capture_pcm_evidence(record, spec, user_input)
         created = self.event_store.append(
             record.id,
             "run.created",
@@ -103,13 +173,21 @@ class StudioRunService:
         if on_event is not None:
             on_event(created)
 
+        from ksadk.kernel.ingress import kernel_route_active
+
+        if kernel_route_active():
+            return await self._kernel_run(
+                spec, user_input, record=record, on_event=on_event
+            )
+
         started = time.monotonic()
         record.status = RunStatus.RUNNING
         record.started_at = datetime.now(timezone.utc)
         self.event_store.save(record)
 
-        def persist(runtime_event: RuntimeEvent) -> RunEvent:
-            event_type, data = project_runtime_event(runtime_event)
+        async def persist(runtime_event: RuntimeEvent) -> RunEvent:
+            persisted = await self.runtime_events.append_one(record.session_id, runtime_event)
+            event_type, data = project_runtime_event(persisted)
             stored = self.event_store.append(record.id, event_type, data)
             if on_event is not None:
                 on_event(stored)
@@ -119,6 +197,7 @@ class StudioRunService:
         final_text = ""
         streamed_final = ""
         runtime_duration_ms: int | None = None
+        item_phases: dict[tuple[str, str], str | None] = {}
         control_queue: asyncio.Queue[tuple[str, ResumePayload | None]] = asyncio.Queue()
         self._control_queues[run_id] = control_queue
         try:
@@ -134,6 +213,8 @@ class StudioRunService:
                 conversation_request["request_metadata"] = {
                     "tool_approval_mode": tool_approval_mode,
                 }
+            if prepared_turn is not None:
+                conversation_request["prepared_turn"] = asdict(prepared_turn)
             request = StartRequest(
                 input=runtime_input if runtime_input is not None else user_input,
                 user_id="local-user",
@@ -155,63 +236,72 @@ class StudioRunService:
                 terminal_seen = False
                 should_resume = False
                 async for event in self.executor.stream(handle):
-                    persist(event)
+                    await persist(event)
                     if self._cancel_flags.get(run_id):
                         raise asyncio.CancelledError()
-                    if event.event_type == EventType.TEXT_DELTA and event.phase == "final_answer":
-                        text = str(event.payload.get("text") or "")
-                        if event.payload.get("replace"):
+                    if isinstance(event, ItemStarted) and event.item_kind == "message":
+                        item_phases[(event.scope_id, event.item_id)] = event.phase
+                    elif (
+                        isinstance(event, ItemUpdated)
+                        and event.item_kind == "message"
+                        and item_phases.get(
+                            (event.scope_id, event.item_id), "final_answer"
+                        )
+                        == "final_answer"
+                    ):
+                        text = event.update.text if isinstance(event.update, TextContent) else ""
+                        if event.op == "replace":
                             streamed_final = text
                         else:
                             streamed_final += text
                     elif (
-                        event.event_type == EventType.TEXT_COMPLETED
-                        and event.phase == "final_answer"
+                        isinstance(event, ItemCompleted)
+                        and event.item_kind == "message"
+                        and item_phases.get(
+                            (event.scope_id, event.item_id), "final_answer"
+                        )
+                        == "final_answer"
                     ):
-                        final_text = str(event.payload.get("text") or "")
-                    elif event.event_type == EventType.USAGE_REPORTED:
+                        for part in event.snapshot.parts:
+                            if isinstance(part, TextContent):
+                                final_text = part.text
+                                break
+                    elif isinstance(event, UsageReported):
                         record.usage = Usage(
-                            input_tokens=int(event.payload.get("input_tokens") or 0),
-                            output_tokens=int(event.payload.get("output_tokens") or 0),
-                            total_tokens=int(event.payload.get("total_tokens") or 0),
-                            cached_input_tokens=int(event.payload.get("cached_tokens") or 0),
-                            reasoning_output_tokens=int(event.payload.get("reasoning_tokens") or 0),
+                            input_tokens=event.input_tokens,
+                            output_tokens=event.output_tokens,
+                            total_tokens=event.total_tokens,
+                            cached_input_tokens=event.cached_tokens,
+                            reasoning_output_tokens=event.reasoning_tokens,
                             reported=True,
-                            source=str(event.payload.get("source") or runtime_type),
+                            source=str(event.source.framework or runtime_type),
                         )
-                    elif event.event_type in {
-                        EventType.APPROVAL_REQUESTED,
-                        EventType.A2UI_INTERACTION,
-                    }:
+                    elif isinstance(event, InteractionRequested):
                         record.status = RunStatus.WAITING_INPUT
                         self._waiting_modes[run_id] = "live"
                         self.event_store.save(record)
-                        if event.event_type == EventType.APPROVAL_REQUESTED:
+                        if event.interaction_kind == "approval":
                             self._persist_approval_surface(record, event, on_event=on_event)
-                    elif event.event_type in {
-                        EventType.APPROVAL_RESOLVED,
-                        EventType.A2UI_ACTION,
-                    }:
+                    elif isinstance(event, InteractionResolved):
                         record.status = RunStatus.RUNNING
                         self._waiting_modes.pop(run_id, None)
                         self.event_store.save(record)
-                    elif event.event_type == EventType.RUN_FAILED:
+                    elif isinstance(event, RunFailed):
                         terminal_seen = True
                         record.status = RunStatus.FAILED
                         record.error = {
                             "code": "RUNTIME_RUN_FAILED",
-                            "message": str(event.payload.get("error") or "Runtime 运行失败"),
+                            "message": str(event.error.message or "Runtime 运行失败"),
                         }
-                    elif event.event_type == EventType.RUN_CANCELED:
+                    elif isinstance(event, RunCanceled):
                         terminal_seen = True
                         record.status = RunStatus.CANCELLED
                         record.error = {
                             "code": "RUN_CANCELLED",
-                            "message": str(event.payload.get("status") or "运行已取消"),
+                            "message": str(event.reason or "运行已取消"),
                         }
-                    elif event.event_type == EventType.RUN_INTERRUPTED:
-                        interrupted_status = str(event.payload.get("status") or "")
-                        if interrupted_status == "paused":
+                    elif isinstance(event, RunInterrupted):
+                        if event.reason == "user_pause":
                             record.status = RunStatus.PAUSED
                             should_resume = True
                         elif record.status == RunStatus.WAITING_INPUT:
@@ -222,13 +312,17 @@ class StudioRunService:
                             record.status = RunStatus.INTERRUPTED
                             record.error = {
                                 "code": "RUN_INTERRUPTED",
-                                "message": interrupted_status or "运行已中断",
+                                "message": event.reason or "运行已中断",
                             }
                         self.event_store.save(record)
-                    elif event.event_type == EventType.RUN_COMPLETED:
+                    elif isinstance(event, RunCompleted):
                         terminal_seen = True
                         record.status = RunStatus.COMPLETED
-                        raw_duration = event.payload.get("duration_ms")
+                        raw_duration = event.source.metadata.get("duration_ms")
+                        if raw_duration is None:
+                            metrics = event.source.metadata.get("metrics")
+                            if isinstance(metrics, dict):
+                                raw_duration = metrics.get("duration_ms")
                         if raw_duration is not None:
                             runtime_duration_ms = max(0, int(raw_duration))
                 if terminal_seen:
@@ -282,30 +376,44 @@ class StudioRunService:
                     cancel_result = "cancel_failed"
             record.status = RunStatus.CANCELLED
             record.error = {"code": "RUN_CANCELLED", "message": "运行已取消"}
-            cancelled = RuntimeEvent.create(
-                EventType.RUN_CANCELED,
-                agent_id=spec.agent_id,
-                user_id="local-user",
-                session_id=session,
-                invocation_id=handle.run_id if handle is not None else run_id,
-                seq_id=len(self.event_store.events(run_id)) + 1,
-                payload={"status": "cancelled", "cancel_result": cancel_result},
+            cancelled_run_id = handle.run_id if handle is not None else run_id
+            cancelled = RunCanceled(
+                schema_version=2,
+                event_id=f"evt_cancel_{uuid4().hex}",
+                seq=len(self.event_store.events(run_id)) + 1,
+                timestamp=time.time(),
+                run_id=cancelled_run_id,
+                scope_id=cancelled_run_id,
+                source=SourceRef(
+                    framework="ksadk",
+                    metadata={"cancel_result": cancel_result},
+                ),
+                status="canceled",
+                reason="cancelled",
             )
-            persist(cancelled)
+            await persist(cancelled)
             raise
         except Exception as exc:  # noqa: BLE001
             record.status = RunStatus.FAILED
             record.error = {"code": "RUNTIME_RUN_FAILED", "message": str(exc)}
-            failure = RuntimeEvent.create(
-                EventType.RUN_FAILED,
-                agent_id=spec.agent_id,
-                user_id="local-user",
-                session_id=session,
-                invocation_id=handle.run_id if handle is not None else run_id,
-                seq_id=len(self.event_store.events(run_id)) + 1,
-                payload={"status": "failed", "error": str(exc)},
+            failed_run_id = handle.run_id if handle is not None else run_id
+            failure = RunFailed(
+                schema_version=2,
+                event_id=f"evt_fail_{uuid4().hex}",
+                seq=len(self.event_store.events(run_id)) + 1,
+                timestamp=time.time(),
+                run_id=failed_run_id,
+                scope_id=failed_run_id,
+                source=SourceRef(framework="ksadk"),
+                status="failed",
+                error=ErrorInfo(
+                    code="RUNTIME_RUN_FAILED",
+                    message=str(exc),
+                    source="ksadk",
+                    scope_id=failed_run_id,
+                ),
             )
-            persist(failure)
+            await persist(failure)
         finally:
             if handle is not None and self.executor.is_attached(handle):
                 try:
@@ -326,8 +434,98 @@ class StudioRunService:
                 record.duration_ms = int((time.monotonic() - started) * 1000)
                 record.duration_source = "studio"
             self.event_store.save(record)
+            await self._sync_trace(record)
         return record
 
+    async def _sync_trace(self, record: RunRecord) -> None:
+        self.event_store.trace_store.sync(record, await self.events(record.id))
+
+
+    async def _kernel_run(
+        self,
+        spec: StudioRunSpec,
+        user_input: str,
+        *,
+        record: RunRecord,
+        on_event: Callable[[RunEvent], None] | None,
+    ) -> RunRecord:
+        """kernel 路径（灰度 opt-in）：Studio run -> AgentControlCommand -> receipt。
+
+        mutation 只走 kernel.submit；Studio RunEvent shape 保留，cursor 源自
+        同一 Session seq（SessionEventSubscription.after_seq）。
+        """
+        from ksadk.kernel import ingress as _kernel_ingress
+
+        started = time.monotonic()
+        record.status = RunStatus.RUNNING
+        record.started_at = datetime.now(timezone.utc)
+        self.event_store.save(record)
+        try:
+            trusted = _kernel_ingress.trusted_context(
+                source_kind="studio",
+                source_ref=record.id,
+                session_id=record.session_id,
+                operations=("enqueue",),
+                launch_context=spec.launch_context,
+            )
+            idempotency_key = str(
+                (spec.request_config or {}).get("idempotency_key") or record.id
+            )
+            command = _kernel_ingress.map_studio_request(
+                session_id=record.session_id,
+                idempotency_key=idempotency_key,
+                content=user_input,
+                run_id=record.id,
+                trusted=trusted,
+            )
+            receipt = await _kernel_ingress.submit_command(
+                command, permit=trusted.permit
+            )
+            if receipt.status not in ("accepted", "duplicate"):
+                record.status = RunStatus.FAILED
+                record.error = {
+                    "code": "kernel_command_rejected",
+                    "message": f"agent kernel rejected command: {receipt.status}",
+                }
+                self.event_store.save(record)
+                return record
+            output_text = ""
+            async for _seq, projected in _kernel_ingress.subscribe_projected(
+                record.session_id,
+                trusted=trusted,
+                after_seq=int(receipt.accepted_seq or 0),
+                projector=_studio_envelope_projection,
+            ):
+                if projected is None:
+                    continue
+                event_type, data = projected
+                if event_type == "message.delta":
+                    output_text += str(data.get("delta") or "")
+                elif event_type == "run.completed":
+                    output_text = str(data.get("output_text") or output_text)
+                stored = self.event_store.append(record.id, event_type, data)
+                if on_event is not None:
+                    on_event(stored)
+            record.output = output_text
+            record.status = RunStatus.COMPLETED
+            record.completed_at = datetime.now(timezone.utc)
+            record.duration_ms = int((time.monotonic() - started) * 1000)
+            self.event_store.save(record)
+            await self._sync_trace(record)
+            return record
+        except Exception as exc:  # noqa: BLE001
+            logger.exception("Studio kernel ingress failed for run %s", record.id)
+            record.status = RunStatus.FAILED
+            record.error = {
+                "code": "kernel_ingress_failed",
+                "message": str(exc),
+            }
+            record.completed_at = datetime.now(timezone.utc)
+            record.duration_ms = int((time.monotonic() - started) * 1000)
+            self.event_store.save(record)
+            await self._sync_trace(record)
+            return record
+
     async def cancel_run(self, run_id: str) -> dict[str, str]:
         """Request cancellation; the flag and executor perform the actual stop."""
         self._cancel_flags[run_id] = True
@@ -488,21 +686,103 @@ class StudioRunService:
             "resolutionEventId": resolved.id,
         }
 
+    async def _capture_pcm_evidence(
+        self,
+        record: RunRecord,
+        spec: StudioRunSpec,
+        user_input: str,
+    ) -> Any | None:
+        """Prepare once and persist the exact prompt/context input sent to Runtime."""
+
+        try:
+            from ksadk.conversations.runtime_preparation import build_run_input
+            from ksadk.sessions.in_memory import InMemorySessionService
+
+            temporary_sessions = InMemorySessionService()
+            await temporary_sessions.create_session(
+                agent_id=spec.agent_id,
+                user_id="local-user",
+                session_id=record.session_id,
+            )
+            config = dict(spec.request_config or {})
+            prepared = await build_run_input(
+                agent_id=spec.agent_id,
+                user_id="local-user",
+                session_id=record.session_id,
+                messages=self._conversation_messages(
+                    spec.agent_id,
+                    record.session_id,
+                    user_input,
+                ),
+                model=spec.model,
+                instructions=str(config.get("instructions") or ""),
+                agent_system=str(config.get("agent_system") or ""),
+                agent_task=str(config.get("agent_task") or ""),
+                prompt_integration_mode=str(config.get("prompt_integration_mode") or ""),
+                context_engine_rollout=str(config.get("context_engine_rollout") or "") or None,
+                memory_recall_enabled=config.get("memory_recall_enabled"),
+                memory_write_rollout=str(config.get("memory_write_rollout") or "") or None,
+                memory_enabled=config.get("memory_enabled"),
+                memory_write_mode=str(config.get("memory_write_mode") or "candidate"),
+                flush_before_compaction=bool(config.get("flush_before_compaction", True)),
+                provider_ref=str(config.get("provider_ref") or "local-default"),
+                runtime_type=spec.launch_context.runtime_type,
+                deployment_mode=spec.launch_context.deployment_mode,
+                invocation_id=record.id,
+                session_service_provider=lambda: temporary_sessions,
+                agent_max_input_tokens=config.get("max_input_tokens"),
+                agent_reserve_output_tokens=config.get("reserve_output_tokens"),
+            )
+            record.context_plan = prepared.context_plan
+            compiled = prepared.compiled_prompt
+            shadow = prepared.shadow_context_plan or {}
+            record.prompt_evidence = {
+                "contentHash": (compiled or {}).get("prompt_content_hash"),
+                "stablePrefixHash": (compiled or {}).get("prompt_stable_prefix_hash"),
+                "sectionHashes": (compiled or {}).get("prompt_section_hashes", {}),
+                "tokensBySection": (compiled or {}).get("prompt_tokens_by_section", {}),
+                "estimatedTokens": (compiled or {}).get("prompt_estimated_tokens"),
+                "sectionCount": (compiled or {}).get("prompt_section_count"),
+                "integrationMode": shadow.get("integration_mode")
+                or config.get("prompt_integration_mode")
+                or "native",
+                "accountingAccuracy": shadow.get("accounting_accuracy") or "opaque",
+                "promptOwner": shadow.get("prompt_owner") or "runtime",
+                "runtimeType": shadow.get("runtime_type") or spec.launch_context.runtime_type,
+                "deploymentMode": shadow.get("deployment_mode")
+                or spec.launch_context.deployment_mode,
+                "capabilityHash": shadow.get("capability_hash"),
+                "tokensByKind": shadow.get("tokens_by_kind", {}),
+                "plannedInputTokens": shadow.get("planned_input_tokens"),
+            }
+            record.working_state = prepared.working_state
+            for event in getattr(prepared, "memory_recall_events", []):
+                self.event_store.append(
+                    record.id,
+                    event.get("type", "memory.recall.event"),
+                    event,
+                )
+            self.event_store.save(record)
+            return prepared
+        except Exception:  # noqa: BLE001 - evidence collection is best effort
+            logger.exception("Studio PCM evidence capture failed for run %s", record.id)
+            return None
+
     def _persist_approval_surface(
         self,
         record: RunRecord,
-        event: RuntimeEvent,
+        event: InteractionRequested,
         *,
         on_event: Callable[[RunEvent], None] | None,
     ) -> None:
-        approval_id = str(event.payload.get("approval_id") or event.payload.get("call_id") or "")
+        approval_id = event.interaction_id
         if not approval_id:
             return
         surface_id = f"approval-{approval_id}"
-        detail = event.payload.get("detail")
-        detail = detail if isinstance(detail, dict) else {}
+        detail_value = event.request.detail
+        detail = detail_value if isinstance(detail_value, dict) else {}
         command = str(detail.get("command") or detail.get("reason") or "")
-        kind = str(event.payload.get("kind") or "tool")
+        kind = str(event.request.kind or "tool")
         components = [
             {
                 "id": "root",
@@ -602,106 +882,252 @@ class StudioRunService:
 
 
 def project_runtime_event(event: RuntimeEvent) -> tuple[str, dict[str, Any]]:
-    """Project the canonical RuntimeEvent into Studio's persisted event view."""
+    """Project the canonical RuntimeEvent into Studio's persisted event view.
 
-    payload = dict(event.payload)
-    event_type = event.event_type
-    if event_type == EventType.RUN_STARTED:
+    公开承诺字段（契约声明见 ``ksadk/events/projections.py``，执行形态为
+    ``tests/protocol/test_cross_projection_golden.py``）：
+    - 所有事件 payload 必含 ``runId``/``scopeId``；
+    - ``message.*``/``thinking.*`` 含 ``itemId``（delta 另含 ``partId``）；
+    - ``tool.*``/``command.*``/``approval.*``/``a2ui.*`` 含 ``itemId``；
+    - ``a2ui.surface.*`` 含 ``surfaceId`` 与 ``a2uiOperations`` 列表。
+
+    内部不保证字段：除上述外的 payload 附加键、事件类型枚举的完备性
+    （新增 canonical 事件类型在未适配前可能整条丢弃）。
+    """
+
+    if isinstance(event, RunStarted):
         projected = "run.started"
-    elif event_type == EventType.RUN_PROGRESS:
-        projected = str(payload.get("native_event") or "run.progress")
-        native_data = payload.get("native_data")
-        if isinstance(native_data, dict):
-            payload = dict(native_data)
-    elif event_type in {EventType.REASONING_DELTA, EventType.REASONING_COMPLETED}:
-        projected = (
-            "thinking.delta" if event_type == EventType.REASONING_DELTA else "thinking.completed"
-        )
-    elif event_type == EventType.TEXT_DELTA:
-        projected = "message.delta" if event.phase == "final_answer" else "thinking.delta"
-    elif event_type == EventType.TEXT_COMPLETED:
-        projected = "message.completed" if event.phase == "final_answer" else "thinking.completed"
-    elif event_type == EventType.TOOL_CALL_BEGIN:
-        projected = "command.started" if payload.get("name") == "codex.command" else "tool.started"
-        if projected == "command.started":
-            raw_args = payload.get("args")
-            args: dict[str, Any] = raw_args if isinstance(raw_args, dict) else {}
+        payload: dict[str, Any] = {}
+    elif isinstance(event, RunProgress):
+        projected = "run.progress"
+        payload = {"progress": event.progress, "message": event.message}
+    elif isinstance(event, RunCompleted):
+        projected = "run.completed"
+        payload = {}
+    elif isinstance(event, RunFailed):
+        projected = "run.failed"
+        payload = {"error": event.error.message or ""}
+    elif isinstance(event, RunCanceled):
+        projected = "run.cancelled"
+        payload = {"reason": event.reason or ""}
+    elif isinstance(event, RunInterrupted):
+        projected = "run.paused" if event.reason == "user_pause" else "run.interrupted"
+        payload = {"reason": event.reason or ""}
+    elif isinstance(event, ItemUpdated) and event.item_kind in {"message", "reasoning"}:
+        text = event.update.text if isinstance(event.update, TextContent) else ""
+        is_thinking = event.item_kind == "reasoning"
+        projected = "thinking.delta" if is_thinking else "message.delta"
+        payload = {"text": text}
+    elif isinstance(event, ItemCompleted) and event.item_kind in {"message", "reasoning"}:
+        text = ""
+        for part in event.snapshot.parts:
+            if isinstance(part, TextContent):
+                text = part.text
+                break
+        is_thinking = event.item_kind == "reasoning"
+        projected = "thinking.completed" if is_thinking else "message.completed"
+        payload = {"text": text}
+    elif isinstance(event, ItemStarted) and event.item_kind == "tool_call":
+        tool_part = _first_content(event.initial, ToolCallContent) if event.initial else None
+        if tool_part is not None and tool_part.name == "codex.command":
+            projected = "command.started"
+            args = tool_part.arguments if isinstance(tool_part.arguments, dict) else {}
             payload = {
-                "callId": str(payload.get("call_id") or ""),
+                "callId": tool_part.call_id,
                 "command": str(args.get("command") or ""),
                 "cwd": str(args.get("cwd") or ""),
                 "commandActions": args.get("command_actions") or [],
             }
-        else:
+        elif tool_part is not None:
+            projected = "tool.started"
             payload = {
-                "callId": str(payload.get("call_id") or ""),
-                "tool": str(payload.get("name") or ""),
-                "args": payload.get("args"),
+                "callId": tool_part.call_id,
+                "tool": tool_part.name,
+                "args": tool_part.arguments,
             }
-    elif event_type == EventType.TOOL_CALL_END:
-        projected = (
-            "command.completed" if payload.get("name") == "codex.command" else "tool.completed"
-        )
-        if projected == "command.completed":
-            raw_result = payload.get("result")
-            result: dict[str, Any] = raw_result if isinstance(raw_result, dict) else {}
+        else:
+            projected = "tool.started"
+            payload = {}
+    elif isinstance(event, ItemCompleted) and event.item_kind == "tool_call":
+        tool_call = _first_content(event.snapshot, ToolCallContent)
+        tool_result = _first_content(event.snapshot, ToolResultContent)
+        if tool_call is not None and tool_call.name == "codex.command":
+            projected = "command.completed"
+            result = (
+                tool_result.result
+                if tool_result is not None and isinstance(tool_result.result, dict)
+                else {}
+            )
             payload = {
-                "callId": str(payload.get("call_id") or ""),
+                "callId": tool_call.call_id,
                 "status": str(result.get("status") or ""),
                 "exitCode": result.get("exit_code"),
                 "durationMs": result.get("duration_ms"),
                 "output": str(result.get("output") or ""),
             }
         else:
-            raw_tool_result = payload.get("result")
-            tool_result: dict[str, Any] = (
-                raw_tool_result if isinstance(raw_tool_result, dict) else {}
+            projected = "tool.completed"
+            result = (
+                tool_result.result
+                if tool_result is not None and isinstance(tool_result.result, dict)
+                else {}
             )
-            tool_status = str(tool_result.get("status") or "")
-            if tool_result.get("error"):
+            tool_status = str(result.get("status") or "")
+            if tool_result is not None and tool_result.is_error:
                 tool_status = "failed"
+            call_id = (tool_call or tool_result).call_id if (tool_call or tool_result) else ""
             payload = {
-                "callId": str(payload.get("call_id") or ""),
-                "tool": str(payload.get("name") or ""),
+                "callId": call_id,
+                "tool": tool_call.name if tool_call is not None else "",
                 "status": tool_status,
-                "durationMs": tool_result.get("duration_ms"),
-                "output": str(tool_result.get("output") or ""),
-                **({"error": str(tool_result["error"])} if tool_result.get("error") else {}),
+                "durationMs": result.get("duration_ms"),
+                "output": str(result.get("output") or ""),
             }
-    elif event_type == EventType.RUN_COMPLETED:
-        projected = "run.completed"
-    elif event_type == EventType.RUN_FAILED:
-        projected = "run.failed"
-    elif event_type == EventType.RUN_CANCELED:
-        projected = "run.cancelled"
-    elif event_type == EventType.RUN_INTERRUPTED:
-        projected = (
-            "run.paused" if str(payload.get("status") or "") == "paused" else "run.interrupted"
-        )
-    elif event_type in {
-        EventType.A2UI_SURFACE_BEGIN,
-        EventType.A2UI_SURFACE_UPDATE,
-        EventType.A2UI_SURFACE_END,
-        EventType.A2UI_INTERACTION,
-        EventType.A2UI_ACTION,
-    }:
-        projected = str(event_type)
-        surface_id = str(payload.get("surface_id") or payload.get("surfaceId") or "")
-        if surface_id:
-            payload["surfaceId"] = surface_id
-        interaction_id = str(payload.get("interaction_id") or payload.get("interactionId") or "")
-        if interaction_id:
-            payload["interactionId"] = interaction_id
-        schema = payload.get("input_schema", payload.get("inputSchema"))
-        if isinstance(schema, dict):
-            payload["inputSchema"] = schema
-        operations = project_a2ui_operations(event_type, payload)
-        if operations:
-            payload["a2uiOperations"] = operations
+            if tool_result is not None and tool_result.is_error:
+                payload["error"] = str(result.get("error") or "")
+    elif (
+        isinstance(event, (ItemStarted, ItemUpdated, ItemCompleted))
+        and event.item_kind == "data"
+        and event.source.protocol == "a2ui"
+    ):
+        projected, payload = _project_a2ui_surface(event)
+    elif isinstance(event, InteractionRequested):
+        if event.interaction_kind == "approval":
+            projected = "approval.requested"
+            payload = {
+                "approvalId": event.interaction_id,
+                "callId": event.request.call_id or "",
+                "kind": event.request.kind,
+                "detail": event.request.detail,
+            }
+        else:
+            projected = "a2ui.interaction"
+            payload = {
+                "interactionId": event.interaction_id,
+                "kind": "form",
+                "inputSchema": {},
+            }
+    elif isinstance(event, InteractionResolved):
+        if event.interaction_kind == "approval":
+            projected = "approval.resolved"
+            payload = {
+                "approvalId": event.interaction_id,
+                "callId": "",
+                "decision": "",
+            }
+        else:
+            projected = "a2ui.action"
+            payload = {"interactionId": event.interaction_id}
+    elif isinstance(event, ContinuationCreated):
+        projected = "checkpoint.created"
+        payload = {
+            "checkpointId": event.continuation_id,
+            "granularity": event.ref.get("granularity", "snapshot"),
+            "resumable": event.resumable,
+        }
+    elif isinstance(event, ContinuationResumed):
+        projected = "checkpoint.resumed"
+        payload = {
+            "checkpointId": event.continuation_id,
+            "resumeAttemptId": event.resume_attempt_id,
+        }
+    elif isinstance(event, UsageReported):
+        projected = "usage.reported"
+        payload = {
+            "inputTokens": event.input_tokens,
+            "outputTokens": event.output_tokens,
+            "totalTokens": event.total_tokens,
+            "cachedTokens": event.cached_tokens,
+            "reasoningTokens": event.reasoning_tokens,
+        }
     else:
-        projected = str(event_type)
-    payload["runtimeEvent"] = event.to_dict()
+        projected = event.event_type
+        payload = {}
+
+    _attach_studio_identity(payload, event)
+    payload["runtimeEvent"] = dump_runtime_event(event)
     return projected, payload
 
 
+def _first_content(
+    snapshot: ContentSnapshot | None, content_type: type
+) -> Any | None:
+    if snapshot is None:
+        return None
+    for part in snapshot.parts:
+        if isinstance(part, content_type):
+            return part
+    return None
+
+
+def _project_a2ui_surface(
+    event: ItemStarted | ItemUpdated | ItemCompleted,
+) -> tuple[str, dict[str, Any]]:
+    if isinstance(event, ItemStarted):
+        projected = "a2ui.surface.begin"
+        data_parts = event.initial.parts if event.initial is not None else ()
+    elif isinstance(event, ItemUpdated):
+        projected = "a2ui.surface.update"
+        data_parts = (event.update,) if isinstance(event.update, DataContent) else ()
+    else:
+        projected = "a2ui.surface.end"
+        data_parts = event.snapshot.parts
+
+    surface_id = str(event.source.metadata.get("surface_id") or "")
+    operations: list[dict[str, Any]] = []
+    for part in data_parts:
+        if isinstance(part, DataContent):
+            data = part.data
+            if isinstance(data, list):
+                operations.extend(dict(op) for op in data if isinstance(op, Mapping))
+    if not operations:
+        operations = project_a2ui_operations(projected, {"surface_id": surface_id})
+    payload: dict[str, Any] = {
+        "surfaceId": surface_id,
+        "a2uiOperations": operations,
+    }
+    return projected, payload
+
+
+def _attach_studio_identity(payload: dict[str, Any], event: RuntimeEvent) -> None:
+    """Attach §8.4 identity fields (runId/scopeId/itemId/partId/operation)."""
+    payload["runId"] = event.run_id
+    payload["scopeId"] = event.scope_id
+    if isinstance(event, (ItemStarted, ItemUpdated, ItemCompleted, ItemFailed)):
+        payload["itemId"] = event.item_id
+    if isinstance(event, ItemUpdated):
+        payload["operation"] = event.op
+    if isinstance(event, ItemUpdated) and hasattr(event.update, "part_id"):
+        payload["partId"] = event.update.part_id
+    if isinstance(event, ItemStarted) and event.initial is not None:
+        for part in event.initial.parts:
+            if hasattr(part, "part_id"):
+                payload["partId"] = part.part_id
+                break
+    if isinstance(event, ItemCompleted):
+        for part in event.snapshot.parts:
+            if hasattr(part, "part_id"):
+                payload["partId"] = part.part_id
+                break
+    if isinstance(event, (InteractionRequested, InteractionResolved)):
+        payload["itemId"] = event.interaction_id
+    if isinstance(event, (ContinuationCreated, ContinuationResumed)):
+        payload["itemId"] = event.continuation_id
+
+
 __all__ = ["StudioRunService", "StudioRunSpec", "project_runtime_event"]
+
+
+def _studio_envelope_projection(envelope) -> tuple[str, dict[str, Any]] | None:
+    """Session envelope -> Studio RunEvent 投影；cursor 仍用 envelope.seq。"""
+
+    payload = envelope.payload or {}
+    if envelope.event_type == "run.completed":
+        return "run.completed", {
+            "runId": envelope.run_id or "",
+            "output_text": str(payload.get("output_text") or ""),
+        }
+    text = str(payload.get("delta") or payload.get("text") or "")
+    if text:
+        return "message.delta", {"delta": text}
+    return None