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

ksadk/studio/run_service.py

@@ -3,15 +3,24 @@
 from __future__ import annotations
 
 import asyncio
+import hashlib
+import json
 import logging
 import time
 from collections.abc import Callable, Mapping
 from dataclasses import asdict, dataclass, field
 from datetime import datetime, timezone
+from pathlib import Path
 from typing import Any
 from uuid import uuid4
 
+from jsonschema import Draft202012Validator
+
 from ksadk.agui.a2ui_projection import project_a2ui_operations
+from ksadk.conversations.projector import (
+    project_conversation_item,
+    project_interaction_conversation_item,
+)
 from ksadk.events.canonical import (
     ContinuationCreated,
     ContinuationResumed,
@@ -22,6 +31,7 @@ from ksadk.events.canonical import (
     ItemFailed,
     ItemStarted,
     ItemUpdated,
+    OutputRef,
     RunCanceled,
     RunCompleted,
     RunFailed,
@@ -32,7 +42,9 @@ from ksadk.events.canonical import (
     SourceRef,
     UsageReported,
     dump_runtime_event,
+    parse_runtime_event,
 )
+from ksadk.events.canonical_store import session_event_to_runtime_event
 from ksadk.events.content import (
     ContentSnapshot,
     DataContent,
@@ -50,6 +62,7 @@ from ksadk.runtime import (
     RuntimeLaunchContext,
     StartRequest,
 )
+from ksadk.runtime.executor import RuntimeStartPreparation
 from ksadk.sessions.base import BaseSessionService
 from ksadk.sessions.local_service import LocalSessionService
 from ksadk.studio.contracts import RunEvent, RunRecord, RunStatus, Usage
@@ -58,6 +71,7 @@ from ksadk.studio.event_store import RunEventStore
 from ksadk.studio.workspace import Workspace
 
 _CANCEL_TIMEOUT_SECONDS = 2.0
+_INTERACTION_SUBMIT_TIMEOUT_SECONDS = 10.0
 
 
 logger = logging.getLogger(__name__)
@@ -73,6 +87,7 @@ class StudioRunSpec:
     model: str | None = None
     request_config: Mapping[str, Any] = field(default_factory=dict)
     manifest_sha256: str = ""
+    plugin_bundle_root: Path | None = None
 
 
 class StudioRunService:
@@ -86,6 +101,7 @@ class StudioRunService:
         event_store: RunEventStore | None = None,
         session_service: BaseSessionService | None = None,
         runtime_events: RuntimeEventStore | None = None,
+        plugin_runtime: Any | None = None,
     ) -> None:
         self.workspace = workspace
         self.executor = executor
@@ -94,10 +110,21 @@ class StudioRunService:
             project_dir=str(workspace.root)
         )
         self.runtime_events = runtime_events or RuntimeEventStore(self.session_service)
+        self.plugin_runtime = plugin_runtime
+        self.schedule_assistant: Any | None = None
         self._active_handles: dict[str, Any] = {}
+        self._active_sessions: set[tuple[str, str]] = set()
         self._cancel_flags: dict[str, bool] = {}
-        self._control_queues: dict[str, asyncio.Queue[tuple[str, ResumePayload | None]]] = {}
+        self._control_queues: dict[
+            str,
+            asyncio.Queue[tuple[str, ResumePayload | None, asyncio.Future[None] | None]],
+        ] = {}
         self._waiting_modes: dict[str, str] = {}
+        self._submitted_interactions: dict[str, set[str]] = {}
+        # Interaction resolution appends to one run-level event file.  Serialise
+        # every decision for that run, not only identical interaction ids, so
+        # two concurrently visible cards cannot overwrite each other's receipt.
+        self._interaction_locks: dict[str, asyncio.Lock] = {}
 
     async def recover_interrupted(self) -> None:
         """Settle local runs left active across a Studio restart.
@@ -122,6 +149,7 @@ class StudioRunService:
                 "run.interrupted",
                 {"reason": "local_studio_restarted", "recoverable": False},
             )
+            self._expire_unresolved_interactions(record)
 
     async def events(self, run_id: str, *, after: int = 0) -> list[RunEvent]:
         """Read the durable Studio event timeline for API/SSE replay."""
@@ -135,6 +163,38 @@ class StudioRunService:
         runtime_input: Any = None,
         session_id: str | None = None,
         on_event: Callable[[RunEvent], None] | None = None,
+    ) -> RunRecord:
+        session = session_id or f"ses_{uuid4().hex}"
+        key = (spec.agent_id, session)
+        # Claim before the first await, including preparation and plugin runs.
+        # A second turn must never attach another adapter to the live thread.
+        if key in self._active_sessions:
+            raise StudioError(
+                "SESSION_RUN_ACTIVE",
+                "上一轮仍在运行或等待回答，请先完成回答或停止运行。",
+                status_code=409,
+                details={"sessionId": session},
+            )
+        self._active_sessions.add(key)
+        try:
+            return await self._run_owned(
+                spec,
+                user_input,
+                runtime_input=runtime_input,
+                session_id=session,
+                on_event=on_event,
+            )
+        finally:
+            self._active_sessions.discard(key)
+
+    async def _run_owned(
+        self,
+        spec: StudioRunSpec,
+        user_input: str,
+        *,
+        runtime_input: Any,
+        session_id: str,
+        on_event: Callable[[RunEvent], None] | None,
     ) -> RunRecord:
         run_id = f"run_{uuid4().hex}"
         session = session_id or f"ses_{uuid4().hex}"
@@ -173,11 +233,41 @@ class StudioRunService:
         if on_event is not None:
             on_event(created)
 
-        from ksadk.kernel.ingress import kernel_route_active
+        if self.schedule_assistant is not None and (
+            self.schedule_assistant.matches(user_input)
+            or self.schedule_assistant.matches_followup(spec.agent_id, session, user_input)
+        ):
+            handled = await self._schedule_run(record, user_input, on_event=on_event)
+            if handled is not None:
+                return handled
 
-        if kernel_route_active():
+        provider_runtime_adapter = (
+            spec.plugin_bundle_root is not None
+            and (
+                runtime_type == "codex"
+                or bool(spec.request_config.get("provider_runtime_adapter"))
+            )
+        )
+        # A process-global Codex Kernel can share Agent/cwd with this Build
+        # while owning a legacy direct factory. New Builds must retain their
+        # exact Provider activation, including when that global Kernel exists.
+        kernel_runtime = (
+            None if provider_runtime_adapter else self._kernel_runtime_for_spec(spec)
+        )
+        if kernel_runtime is not None:
             return await self._kernel_run(
-                spec, user_input, record=record, on_event=on_event
+                spec,
+                user_input,
+                record=record,
+                on_event=on_event,
+                kernel_runtime=kernel_runtime,
+            )
+        if spec.plugin_bundle_root is not None and not provider_runtime_adapter:
+            return await self._plugin_run(
+                spec,
+                user_input,
+                record=record,
+                on_event=on_event,
             )
 
         started = time.monotonic()
@@ -187,18 +277,32 @@ class StudioRunService:
 
         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)
+            event_type, data = project_runtime_event(
+                persisted,
+                session_id=record.session_id,
+                public_run_id=record.id,
+            )
+            if isinstance(persisted, InteractionRequested):
+                data["revision"] = 1
+                conversation_item = data.get("conversationItem")
+                if isinstance(conversation_item, dict):
+                    item_payload = conversation_item.get("payload")
+                    if isinstance(item_payload, dict):
+                        item_payload["revision"] = 1
             stored = self.event_store.append(record.id, event_type, data)
             if on_event is not None:
                 on_event(stored)
             return stored
 
         handle = None
-        final_text = ""
-        streamed_final = ""
+        completed_text_by_item: dict[tuple[str, str], str] = {}
+        streamed_text_by_item: dict[tuple[str, str], str] = {}
+        terminal_output_refs: tuple[OutputRef, ...] = ()
         runtime_duration_ms: int | None = None
         item_phases: dict[tuple[str, str], str | None] = {}
-        control_queue: asyncio.Queue[tuple[str, ResumePayload | None]] = asyncio.Queue()
+        control_queue: asyncio.Queue[
+            tuple[str, ResumePayload | None, asyncio.Future[None] | None]
+        ] = asyncio.Queue()
         self._control_queues[run_id] = control_queue
         try:
             tool_approval_mode = str(spec.request_config.get("tool_approval_mode") or "")
@@ -225,10 +329,29 @@ class StudioRunService:
                 metadata={
                     "invocation_id": run_id,
                     CONVERSATION_PREPROCESSING_METADATA_KEY: conversation_request,
-                    **self._native_session_metadata(spec.agent_id, session, runtime_type),
+                    **self._native_session_metadata(
+                        spec.agent_id,
+                        session,
+                        str(
+                            spec.request_config.get("provider_runtime_type")
+                            or runtime_type
+                        ),
+                        spec.build_id,
+                    ),
                 },
             )
-            handle = await self.executor.start(spec.launch_context, request)
+            preparation = None
+            if provider_runtime_adapter:
+                if self.plugin_runtime is None:
+                    raise StudioError(
+                        "PLUGIN_RUNTIME_UNAVAILABLE", "Codex Provider Runtime 不可用",
+                        status_code=503,
+                    )
+                adapter = self.plugin_runtime.kernel_adapter_provider(spec)()
+                preparation = RuntimeStartPreparation(context=spec.launch_context, adapter=adapter)
+            handle = await self.executor.start(
+                spec.launch_context, request, preparation=preparation,
+            )
             record.runtime_handle = handle.model_dump(mode="json")
             self.event_store.save(record)
             self._active_handles[run_id] = handle
@@ -236,6 +359,27 @@ class StudioRunService:
                 terminal_seen = False
                 should_resume = False
                 async for event in self.executor.stream(handle):
+                    if (
+                        isinstance(event, RunInterrupted)
+                        and event.interaction_id
+                        and record.status == RunStatus.WAITING_INPUT
+                        and event.source.framework == "codex"
+                    ):
+                        # Codex emits this companion event immediately after a
+                        # live JSON-RPC approval request. The native turn stays
+                        # attached and must be released through submit; trying
+                        # to resume it deadlocks that request and later breaks
+                        # the app-server pipe.
+                        self._waiting_modes[run_id] = "live"
+                        continue
+                    if isinstance(event, InteractionResolved) and event.source.framework == "codex":
+                        submitted = self._submitted_interactions.get(run_id, set())
+                        provider_call_id = str(getattr(event.response, "call_id", None) or "")
+                        if event.interaction_id in submitted or provider_call_id in submitted:
+                            # submit_interaction atomically persists the public
+                            # terminal fact and receipt. Ignore the provider's
+                            # echo so replay never shows the approval twice.
+                            continue
                     await persist(event)
                     if self._cancel_flags.get(run_id):
                         raise asyncio.CancelledError()
@@ -244,28 +388,28 @@ class StudioRunService:
                     elif (
                         isinstance(event, ItemUpdated)
                         and event.item_kind == "message"
-                        and item_phases.get(
-                            (event.scope_id, event.item_id), "final_answer"
-                        )
+                        and item_phases.get((event.scope_id, event.item_id), "final_answer")
                         == "final_answer"
                     ):
                         text = event.update.text if isinstance(event.update, TextContent) else ""
+                        item_key = (event.scope_id, event.item_id)
                         if event.op == "replace":
-                            streamed_final = text
+                            streamed_text_by_item[item_key] = text
                         else:
-                            streamed_final += text
+                            streamed_text_by_item[item_key] = (
+                                streamed_text_by_item.get(item_key, "") + text
+                            )
                     elif (
                         isinstance(event, ItemCompleted)
                         and event.item_kind == "message"
-                        and item_phases.get(
-                            (event.scope_id, event.item_id), "final_answer"
-                        )
+                        and item_phases.get((event.scope_id, event.item_id), "final_answer")
                         == "final_answer"
                     ):
-                        for part in event.snapshot.parts:
-                            if isinstance(part, TextContent):
-                                final_text = part.text
-                                break
+                        completed_text_by_item[(event.scope_id, event.item_id)] = "".join(
+                            part.text
+                            for part in event.snapshot.parts
+                            if isinstance(part, TextContent)
+                        )
                     elif isinstance(event, UsageReported):
                         record.usage = Usage(
                             input_tokens=event.input_tokens,
@@ -318,6 +462,7 @@ class StudioRunService:
                     elif isinstance(event, RunCompleted):
                         terminal_seen = True
                         record.status = RunStatus.COMPLETED
+                        terminal_output_refs = event.output_refs
                         raw_duration = event.source.metadata.get("duration_ms")
                         if raw_duration is None:
                             metrics = event.source.metadata.get("metrics")
@@ -331,7 +476,7 @@ class StudioRunService:
                     record.status = RunStatus.COMPLETED
                     break
 
-                command, resume_payload = await control_queue.get()
+                command, resume_payload, submit_ack = await control_queue.get()
                 if command == "cancel" or self._cancel_flags.get(run_id):
                     raise asyncio.CancelledError()
                 if command != "resume":
@@ -342,11 +487,18 @@ class StudioRunService:
                     if native_thread_id
                     else ResumeTarget(kind="invocation_id", id=handle.run_id)
                 )
-                handle = await self.executor.resume(
-                    handle,
-                    target,
-                    resume_payload,
-                )
+                try:
+                    handle = await self.executor.resume(
+                        handle,
+                        target,
+                        resume_payload,
+                    )
+                except Exception as exc:
+                    if submit_ack is not None and not submit_ack.done():
+                        submit_ack.set_exception(exc)
+                    raise
+                if submit_ack is not None and not submit_ack.done():
+                    submit_ack.set_result(None)
                 self._active_handles[run_id] = handle
                 record.runtime_handle = handle.model_dump(mode="json")
                 record.status = RunStatus.RUNNING
@@ -360,7 +512,17 @@ class StudioRunService:
                 if on_event is not None:
                     on_event(resumed)
                 self.event_store.save(record)
-            record.output = final_text or streamed_final
+            text_by_item = {**streamed_text_by_item, **completed_text_by_item}
+            if terminal_output_refs:
+                terminal_parts = [
+                    text_by_item.get((ref.scope_id, ref.item_id), "")
+                    for ref in terminal_output_refs
+                ]
+                record.output = "\n\n".join(part for part in terminal_parts if part)
+            else:
+                completed_parts = [part for part in completed_text_by_item.values() if part]
+                fallback_parts = [part for part in streamed_text_by_item.values() if part]
+                record.output = "\n\n".join(completed_parts or fallback_parts)
         except asyncio.CancelledError:
             cancel_result = "task_cancelled"
             if handle is not None and self.executor.is_attached(handle):
@@ -426,7 +588,9 @@ class StudioRunService:
             self._cancel_flags.pop(run_id, None)
             self._control_queues.pop(run_id, None)
             self._waiting_modes.pop(run_id, None)
+            self._submitted_interactions.pop(run_id, None)
             record.completed_at = datetime.now(timezone.utc)
+            self._expire_unresolved_interactions(record, on_event=on_event)
             if runtime_duration_ms is not None:
                 record.duration_ms = runtime_duration_ms
                 record.duration_source = "runtime"
@@ -437,9 +601,400 @@ class StudioRunService:
             await self._sync_trace(record)
         return record
 
+    async def _schedule_run(
+        self,
+        record: RunRecord,
+        user_input: str,
+        *,
+        on_event: Callable[[RunEvent], None] | None,
+    ) -> RunRecord | None:
+        """Persist real host tool receipts on the canonical conversation stream."""
+        started = time.monotonic()
+
+        def envelope(kind: str) -> dict[str, Any]:
+            result = _plugin_event_envelope(record, kind)
+            result["source"] = SourceRef(
+                framework="ksadk",
+                metadata={"runtime": "studio-scheduler", "agent_id": record.agent_id},
+            )
+            return result
+
+        async def publish(event: RuntimeEvent) -> None:
+            persisted = await self.runtime_events.append_one(record.session_id, event)
+            kind, data = project_runtime_event(
+                persisted, session_id=record.session_id, public_run_id=record.id
+            )
+            stored = self.event_store.append(record.id, kind, data)
+            if on_event is not None:
+                on_event(stored)
+
+        call_id = None
+        try:
+            intent = await self.schedule_assistant.plan(
+                record.agent_id,
+                user_input,
+                record.session_id,
+                build_id=record.build_id,
+                model_name=record.model,
+            )
+            if self._cancel_flags.get(record.id):
+                raise asyncio.CancelledError()
+            if intent.action == "ignore":
+                return None
+            record.status = RunStatus.RUNNING
+            record.started_at = datetime.now(timezone.utc)
+            record.runtime_handle = {"provider": "studio-scheduler"}
+            self.event_store.save(record)
+            await publish(RunStarted(**envelope("run.started"), status="running"))
+            call_id = f"{record.id}:schedule"
+            arguments = intent.model_dump(mode="json", exclude_none=True)
+            await publish(
+                ItemStarted(
+                    **envelope("tool.started"),
+                    item_id=call_id,
+                    item_kind="tool_call",
+                    initial=ContentSnapshot(
+                        parts=(
+                            ToolCallContent(
+                                part_id=f"{call_id}:call",
+                                call_id=call_id,
+                                name="studio_schedule",
+                                arguments=arguments,
+                            ),
+                        )
+                    ),
+                )
+            )
+            result = await self.schedule_assistant.execute(
+                record.agent_id, record.session_id, intent
+            )
+            await publish(
+                ItemCompleted(
+                    **envelope("tool.completed"),
+                    item_id=call_id,
+                    item_kind="tool_call",
+                    snapshot=ContentSnapshot(
+                        parts=(
+                            ToolResultContent(
+                                part_id=f"{call_id}:result", call_id=call_id, result=result
+                            ),
+                        )
+                    ),
+                )
+            )
+            output = result["message"]
+            item_id, part_id = f"{record.id}:assistant", f"{record.id}:text"
+            await publish(
+                ItemStarted(
+                    **envelope("item.started"),
+                    item_id=item_id,
+                    item_kind="message",
+                    phase="final_answer",
+                )
+            )
+            await publish(
+                ItemUpdated(
+                    **envelope("item.updated"),
+                    item_id=item_id,
+                    item_kind="message",
+                    op="append",
+                    update=TextContent(part_id=part_id, text=output),
+                )
+            )
+            await publish(
+                ItemCompleted(
+                    **envelope("item.completed"),
+                    item_id=item_id,
+                    item_kind="message",
+                    snapshot=ContentSnapshot(parts=(TextContent(part_id=part_id, text=output),)),
+                )
+            )
+            if intent._usage is not None and intent._usage.reported:
+                record.usage = intent._usage.model_copy(update={"source": "studio-scheduler"})
+                await publish(
+                    UsageReported(
+                        **envelope("usage.reported"),
+                        input_tokens=record.usage.input_tokens,
+                        output_tokens=record.usage.output_tokens,
+                        total_tokens=record.usage.total_tokens,
+                        cached_tokens=record.usage.cached_input_tokens,
+                        reasoning_tokens=record.usage.reasoning_output_tokens,
+                    )
+                )
+            await publish(
+                RunCompleted(
+                    **envelope("run.completed"),
+                    status="completed",
+                    output_refs=(OutputRef(scope_id=record.id, item_id=item_id, part_id=part_id),),
+                )
+            )
+            record.output = output
+            record.status = RunStatus.COMPLETED
+        except asyncio.CancelledError:
+            record.status = RunStatus.CANCELLED
+            record.completed_at = datetime.now(timezone.utc)
+            self._cancel_flags.pop(record.id, None)
+            await publish(
+                RunCanceled(**envelope("run.canceled"), status="canceled", reason="cancelled")
+            )
+            self.event_store.save(record)
+            raise
+        except Exception as error:
+            code = str(getattr(error, "code", "SCHEDULE_REQUEST_FAILED"))
+            record.status = RunStatus.FAILED
+            record.error = {"code": code, "message": str(error)}
+            if call_id is not None:
+                await publish(
+                    ItemFailed(
+                        **envelope("tool.failed"),
+                        item_id=call_id,
+                        item_kind="tool_call",
+                        error=ErrorInfo(
+                            code=code,
+                            message=str(error),
+                            source="studio-scheduler",
+                            scope_id=record.id,
+                        ),
+                    )
+                )
+            await publish(
+                RunFailed(
+                    **envelope("run.failed"),
+                    status="failed",
+                    error=ErrorInfo(
+                        code=code, message=str(error), source="studio-scheduler", scope_id=record.id
+                    ),
+                )
+            )
+        record.completed_at = datetime.now(timezone.utc)
+        record.duration_ms = int((time.monotonic() - started) * 1000)
+        record.duration_source = "studio"
+        self._cancel_flags.pop(record.id, None)
+        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 _plugin_run(
+        self,
+        spec: StudioRunSpec,
+        user_input: str,
+        *,
+        record: RunRecord,
+        on_event: Callable[[RunEvent], None] | None,
+    ) -> RunRecord:
+        """Execute a composed Build without translating it into ADK/LangGraph.
+
+        PluginHost retains the activation under the Studio session id.  Harness
+        providers write canonical RuntimeEvents directly; providers that only
+        implement the minimum request/result protocol receive a canonical
+        envelope here so Studio still has one durable conversation/event model.
+        """
+
+        started = time.monotonic()
+        record.status = RunStatus.RUNNING
+        record.started_at = datetime.now(timezone.utc)
+        record.runtime_handle = {
+            "provider": "pluginhost",
+            "bundleDigest": str(spec.request_config.get("plugin_bundle_digest") or ""),
+            "activationKey": record.session_id,
+        }
+        self.event_store.save(record)
+        rows_before = await self.session_service.get_events(record.session_id)
+        after_seq = max((int(row.seq_id or 0) for row in rows_before), default=0)
+
+        async def publish(events: list[RuntimeEvent]) -> None:
+            for runtime_event in events:
+                event_type, data = project_runtime_event(
+                    runtime_event,
+                    session_id=record.session_id,
+                )
+                stored = self.event_store.append(record.id, event_type, data)
+                if on_event is not None:
+                    on_event(stored)
+
+        try:
+            if self.plugin_runtime is None:
+                raise StudioError(
+                    "PLUGIN_RUNTIME_UNAVAILABLE",
+                    "Studio 尚未配置 PluginHost Runtime",
+                    status_code=503,
+                )
+            request_metadata = {
+                key: value
+                for key, value in {
+                    "tool_approval_mode": spec.request_config.get("tool_approval_mode"),
+                    "collaboration_mode": spec.request_config.get("collaboration_mode"),
+                    "goal_objective": spec.request_config.get("goal_objective"),
+                    "reasoning_effort": spec.request_config.get("effort"),
+                }.items()
+                if value not in {None, ""}
+            }
+            result = await self.plugin_runtime.execute(
+                spec,
+                {
+                    "user_id": "local-user",
+                    "session_id": record.session_id,
+                    "invocation_id": record.id,
+                    "messages": [{"role": "user", "content": user_input}],
+                    "model": spec.model,
+                    "request_metadata": request_metadata,
+                },
+                session_id=record.session_id,
+            )
+            if result.session_id != record.session_id:
+                raise StudioError(
+                    "PLUGIN_SESSION_MISMATCH",
+                    "AgentProvider 返回了不同的 Session",
+                    status_code=502,
+                    details={
+                        "expected": record.session_id,
+                        "actual": result.session_id,
+                    },
+                )
+            canonical = await self._plugin_events_after(
+                record.session_id,
+                after_seq=after_seq,
+                run_id=record.id,
+            )
+            if not canonical:
+                canonical = await self._persist_plugin_result_events(
+                    record,
+                    result.output_text,
+                    usage=result.usage,
+                )
+            await publish(canonical)
+            record.output = result.output_text
+            record.status = RunStatus.COMPLETED
+            _apply_plugin_usage(record, result.usage)
+        except asyncio.CancelledError:
+            record.status = RunStatus.CANCELLED
+            record.error = {"code": "RUN_CANCELLED", "message": "运行已取消"}
+            cancelled = await self.runtime_events.append_one(
+                record.session_id,
+                RunCanceled(
+                    **_plugin_event_envelope(record, "run.canceled"),
+                    status="canceled",
+                    reason="cancelled",
+                ),
+            )
+            await publish([cancelled])
+            raise
+        except Exception as exc:  # noqa: BLE001 - plugin boundary is typed below
+            record.status = RunStatus.FAILED
+            code = str(getattr(exc, "code", "PLUGIN_RUNTIME_FAILED"))
+            record.error = {"code": code, "message": str(exc)}
+            canonical = await self._plugin_events_after(
+                record.session_id,
+                after_seq=after_seq,
+                run_id=record.id,
+            )
+            if canonical:
+                await publish(canonical)
+            else:
+                failed = await self.runtime_events.append_one(
+                    record.session_id,
+                    RunFailed(
+                        **_plugin_event_envelope(record, "run.failed"),
+                        status="failed",
+                        error=ErrorInfo(
+                            code=code,
+                            message=str(exc),
+                            source="pluginhost",
+                            scope_id=record.id,
+                        ),
+                    ),
+                )
+                await publish([failed])
+        finally:
+            record.completed_at = datetime.now(timezone.utc)
+            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 _plugin_events_after(
+        self,
+        session_id: str,
+        *,
+        after_seq: int,
+        run_id: str,
+    ) -> list[RuntimeEvent]:
+        rows = await self.session_service.get_events(
+            session_id,
+            after_seq_id=after_seq,
+        )
+        events: list[RuntimeEvent] = []
+        for row in rows:
+            event = session_event_to_runtime_event(row)
+            if event is not None and event.run_id == run_id:
+                events.append(event)
+        return events
+
+    async def _persist_plugin_result_events(
+        self,
+        record: RunRecord,
+        output_text: str,
+        *,
+        usage: Mapping[str, Any],
+    ) -> list[RuntimeEvent]:
+        item_id = f"{record.id}:assistant"
+        part_id = f"{record.id}:text"
+        snapshot = ContentSnapshot(parts=(TextContent(part_id=part_id, text=output_text),))
+        events: list[RuntimeEvent] = [
+            RunStarted(
+                **_plugin_event_envelope(record, "run.started"),
+                status="running",
+            ),
+            ItemStarted(
+                **_plugin_event_envelope(record, "item.started"),
+                item_id=item_id,
+                item_kind="message",
+                phase="final_answer",
+            ),
+            ItemUpdated(
+                **_plugin_event_envelope(record, "item.updated"),
+                item_id=item_id,
+                item_kind="message",
+                op="append",
+                update=TextContent(part_id=part_id, text=output_text),
+            ),
+            ItemCompleted(
+                **_plugin_event_envelope(record, "item.completed"),
+                item_id=item_id,
+                item_kind="message",
+                snapshot=snapshot,
+            ),
+        ]
+        normalized = _normalized_plugin_usage(usage)
+        if normalized["reported"]:
+            events.append(
+                UsageReported(
+                    **_plugin_event_envelope(record, "usage.reported"),
+                    input_tokens=normalized["input_tokens"],
+                    output_tokens=normalized["output_tokens"],
+                    total_tokens=normalized["total_tokens"],
+                    cached_tokens=normalized["cached_tokens"],
+                    reasoning_tokens=normalized["reasoning_tokens"],
+                )
+            )
+        events.append(
+            RunCompleted(
+                **_plugin_event_envelope(record, "run.completed"),
+                status="completed",
+                output_refs=(
+                    OutputRef(
+                        scope_id=record.id,
+                        item_id=item_id,
+                        part_id=part_id,
+                    ),
+                ),
+            )
+        )
+        return [await self.runtime_events.append_one(record.session_id, event) for event in events]
 
     async def _kernel_run(
         self,
@@ -448,6 +1003,7 @@ class StudioRunService:
         *,
         record: RunRecord,
         on_event: Callable[[RunEvent], None] | None,
+        kernel_runtime: Any,
     ) -> RunRecord:
         """kernel 路径（灰度 opt-in）：Studio run -> AgentControlCommand -> receipt。
 
@@ -464,13 +1020,17 @@ class StudioRunService:
             trusted = _kernel_ingress.trusted_context(
                 source_kind="studio",
                 source_ref=record.id,
+                # The Worker polls the concrete Kernel Runtime instance, not
+                # whichever synthetic ``local-agent`` happened to be inferred
+                # from a Studio request.  A Studio Build may use the Kernel
+                # path only after ``_kernel_runtime_for_spec`` established that
+                # it is this Runtime's exact Agent/Runtime binding.
+                tenant_id=str(kernel_runtime.config.tenant_id),
+                agent_instance_id=str(kernel_runtime.config.agent_instance_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
             )
+            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,
@@ -478,9 +1038,7 @@ class StudioRunService:
                 run_id=record.id,
                 trusted=trusted,
             )
-            receipt = await _kernel_ingress.submit_command(
-                command, permit=trusted.permit
-            )
+            receipt = await _kernel_ingress.submit_command(command, permit=trusted.permit)
             if receipt.status not in ("accepted", "duplicate"):
                 record.status = RunStatus.FAILED
                 record.error = {
@@ -513,6 +1071,7 @@ class StudioRunService:
             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
@@ -526,12 +1085,58 @@ class StudioRunService:
             await self._sync_trace(record)
             return record
 
+    @staticmethod
+    def _kernel_runtime_for_spec(spec: StudioRunSpec) -> Any | None:
+        """Return the active Kernel Runtime only for its bound Studio Build.
+
+        An in-process AgentKernel owns one concrete RuntimeAdapter factory and
+        its immutable startup defaults.  Merely observing that a Kernel is
+        enabled is therefore insufficient: sending an arbitrary Studio Build
+        through it can silently execute the default Adapter instead.  When the
+        binding is not exact, the existing direct Studio path remains the
+        compatible local behaviour; it is safer than manufacturing a false
+        AgentControl/Scheduler success.
+        """
+
+        from ksadk.kernel.bootstrap import get_agent_kernel_runtime
+        from ksadk.kernel.ingress import kernel_route_active
+
+        if not kernel_route_active():
+            return None
+        runtime = get_agent_kernel_runtime()
+        if runtime is None:
+            return None
+        active_context = getattr(runtime.config, "launch_context", None)
+        if active_context is None:
+            return None
+        if str(getattr(active_context, "runtime_type", "")).strip().lower() != (
+            spec.launch_context.runtime_type.strip().lower()
+        ):
+            return None
+        try:
+            active_project = Path(active_context.project_dir).resolve()
+            build_project = Path(spec.launch_context.project_dir).resolve()
+        except (OSError, TypeError, ValueError):
+            return None
+        if active_project != build_project:
+            return None
+        defaults = getattr(runtime.config, "start_request_defaults", {}) or {}
+        bound_agent_id = str(defaults.get("agent_id") or runtime.config.agent_instance_id).strip()
+        if bound_agent_id != spec.agent_id:
+            return None
+        declared_instance = str(
+            (spec.launch_context.config or {}).get("agent_instance_id") or ""
+        ).strip()
+        if declared_instance and declared_instance != str(runtime.config.agent_instance_id):
+            return None
+        return runtime
+
     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
         queue = self._control_queues.get(run_id)
         if queue is not None:
-            queue.put_nowait(("cancel", None))
+            queue.put_nowait(("cancel", None, None))
         handle = self._active_handles.get(run_id)
         if handle is not None and self.executor.is_attached(handle):
             try:
@@ -582,7 +1187,7 @@ class StudioRunService:
                 "Studio 进程已重启，当前暂停点无法恢复",
                 status_code=409,
             )
-        queue.put_nowait(("resume", ResumePayload(kind="free_text", data="继续运行")))
+        queue.put_nowait(("resume", ResumePayload(kind="free_text", data="继续运行"), None))
         return {"runId": run_id, "status": "resuming"}
 
     async def submit_interaction(
@@ -592,28 +1197,73 @@ class StudioRunService:
         *,
         name: str,
         data: dict[str, Any] | None = None,
+        expected_revision: int,
+        idempotency_key: str,
     ) -> dict[str, Any]:
-        record = self.event_store.get(run_id)
-        if record.status != RunStatus.WAITING_INPUT:
-            raise StudioError(
-                "INTERACTION_NOT_PENDING",
-                "该 Run 当前没有等待中的交互",
-                status_code=409,
+        lock = self._interaction_locks.setdefault(run_id, asyncio.Lock())
+        payload_data = dict(data or {})
+        digest = hashlib.sha256(
+            json.dumps(
+                {"name": name, "data": payload_data},
+                ensure_ascii=False,
+                sort_keys=True,
+                separators=(",", ":"),
+            ).encode("utf-8")
+        ).hexdigest()
+        async with lock:
+            return await self._submit_interaction_locked(
+                run_id,
+                interaction_id,
+                name=name,
+                data=payload_data,
+                expected_revision=expected_revision,
+                idempotency_key=idempotency_key,
+                request_digest=digest,
             )
-        prior = [
-            event
-            for event in self.event_store.events(run_id)
-            if event.type == "a2ui.action"
-            and str(event.data.get("interactionId") or event.data.get("interaction_id") or "")
-            == interaction_id
-        ]
-        if prior:
-            return {"runId": run_id, "interactionId": interaction_id, "status": "resolved"}
+
+    async def _submit_interaction_locked(
+        self,
+        run_id: str,
+        interaction_id: str,
+        *,
+        name: str,
+        data: dict[str, Any],
+        expected_revision: int,
+        idempotency_key: str,
+        request_digest: str,
+    ) -> dict[str, Any]:
+        events = self.event_store.events(run_id)
+        prior = next(
+            (
+                event
+                for event in reversed(events)
+                if event.type == "a2ui.action"
+                and str(event.data.get("interactionId") or "") == interaction_id
+                and _interaction_revision(event.data) > 0
+            ),
+            None,
+        )
+        if prior is not None:
+            if str(prior.data.get("idempotencyKey") or "") != idempotency_key:
+                raise StudioError(
+                    "INTERACTION_ALREADY_RESOLVED",
+                    "该交互已由其他请求处理",
+                    status_code=409,
+                )
+            if str(prior.data.get("requestDigest") or "") != request_digest:
+                raise StudioError(
+                    "INTERACTION_IDEMPOTENCY_CONFLICT",
+                    "同一幂等键不能提交不同内容",
+                    status_code=409,
+                )
+            # A receipt replay is read-only. The run may already be waiting
+            # for a different interaction; never clear that newer wait state.
+            return dict(prior.data.get("receipt") or {})
 
         interaction = next(
             (
                 event
-                for event in reversed(self.event_store.events(run_id))
+                for event in reversed(events)
                 if event.type == "a2ui.interaction"
                 and str(event.data.get("interactionId") or event.data.get("interaction_id") or "")
                 == interaction_id
@@ -622,11 +1272,73 @@ class StudioRunService:
         )
         if interaction is None:
             raise StudioError("INTERACTION_NOT_FOUND", "交互请求不存在", status_code=404)
+        revision = _interaction_revision(interaction.data)
+        if revision < 1:
+            raise StudioError(
+                "INTERACTION_READ_ONLY",
+                "交互请求缺少权威 revision，只能查看不能操作",
+                status_code=409,
+            )
+        if expected_revision != revision:
+            raise StudioError(
+                "INTERACTION_REVISION_MISMATCH",
+                "交互版本已变化，请刷新后重试",
+                status_code=409,
+                details={"expectedRevision": expected_revision, "actualRevision": revision},
+            )
+        record = self.event_store.get(run_id)
+        if record.status != RunStatus.WAITING_INPUT:
+            raise StudioError(
+                "INTERACTION_NOT_PENDING",
+                "该 Run 当前没有等待中的交互",
+                status_code=409,
+            )
         kind = str(interaction.data.get("kind") or "form")
-        payload_data = {"decision": name, **dict(data or {})}
+        if kind != "approval" and name not in {"cancel", "skip"}:
+            schema = interaction.data.get("inputSchema") or {}
+            errors = list(Draft202012Validator(schema).iter_errors(data))
+            if errors:
+                raise StudioError(
+                    "INTERACTION_RESPONSE_INVALID",
+                    "请填写必填问题后再提交。",
+                    status_code=422,
+                )
+        provider_call_id = str(
+            interaction.data.get("callId") or interaction.data.get("call_id") or ""
+        )
+        if kind == "approval" and not provider_call_id:
+            approval_request = next(
+                (
+                    event
+                    for event in reversed(events)
+                    if event.type == "approval.requested"
+                    and str(event.data.get("approvalId") or event.data.get("interactionId") or "")
+                    == interaction_id
+                ),
+                None,
+            )
+            if approval_request is not None:
+                provider_call_id = str(
+                    approval_request.data.get("callId")
+                    or approval_request.data.get("call_id")
+                    or ""
+                )
+        provider_call_id = provider_call_id or interaction_id
+        submitted = self._submitted_interactions.setdefault(run_id, set())
+        submitted.update({interaction_id, provider_call_id})
+        decision = str(data.get("decision") or name)
+        if kind == "approval" and record.runtime_type == "codex":
+            # The shared Web action is named `reject`; Codex app-server calls
+            # the same decision `deny`/`decline`. Do not let a UI alias fall
+            # through as an unsupported native approval decision.
+            decision = {
+                "reject": "deny",
+                "rejected": "deny",
+            }.get(decision.lower(), decision)
+        payload_data = {**data, "decision": decision}
         payload = ResumePayload(
             kind="approval_decision" if kind == "approval" else "hitl_answer",
-            call_id=interaction_id,
+            call_id=provider_call_id,
             data=payload_data,
         )
         mode = self._waiting_modes.get(run_id)
@@ -635,8 +1347,19 @@ class StudioRunService:
             if handle is None or not self.executor.is_attached(handle):
                 raise StudioError("INTERACTION_EXPIRED", "运行时交互已失效", status_code=409)
             try:
-                await self.executor.submit(handle, payload)
-            except (RuntimeError, ValueError) as exc:
+                await asyncio.wait_for(
+                    self.executor.submit(handle, payload),
+                    timeout=_INTERACTION_SUBMIT_TIMEOUT_SECONDS,
+                )
+            except TimeoutError as exc:
+                submitted.difference_update({interaction_id, provider_call_id})
+                raise StudioError(
+                    "INTERACTION_SUBMIT_FAILED",
+                    "运行时未及时确认交互提交，请重试",
+                    status_code=409,
+                ) from exc
+            except Exception as exc:  # noqa: BLE001 - provider errors are user-safe here
+                submitted.difference_update({interaction_id, provider_call_id})
                 raise StudioError(
                     "INTERACTION_SUBMIT_FAILED",
                     str(exc),
@@ -646,45 +1369,143 @@ class StudioRunService:
             queue = self._control_queues.get(run_id)
             if queue is None:
                 raise StudioError("INTERACTION_EXPIRED", "运行时交互已失效", status_code=409)
-            queue.put_nowait(("resume", payload))
+            submit_ack = asyncio.get_running_loop().create_future()
+            queue.put_nowait(("resume", payload, submit_ack))
+            try:
+                await asyncio.wait_for(
+                    submit_ack,
+                    timeout=_INTERACTION_SUBMIT_TIMEOUT_SECONDS,
+                )
+            except TimeoutError as exc:
+                submitted.difference_update({interaction_id, provider_call_id})
+                raise StudioError(
+                    "INTERACTION_SUBMIT_FAILED",
+                    "运行时未及时确认交互提交，请重试",
+                    status_code=409,
+                ) from exc
+            except Exception as exc:  # noqa: BLE001 - provider errors are user-safe here
+                submitted.difference_update({interaction_id, provider_call_id})
+                raise StudioError(
+                    "INTERACTION_SUBMIT_FAILED",
+                    str(exc),
+                    status_code=409,
+                ) from exc
         else:
+            submitted.difference_update({interaction_id, provider_call_id})
             raise StudioError("INTERACTION_EXPIRED", "运行时交互已失效", status_code=409)
 
-        resolved = self.event_store.append(
-            run_id,
-            "approval.resolved" if kind == "approval" else "interaction.resolved",
-            {
-                "runId": run_id,
-                "interactionId": interaction_id,
-                "callId": interaction_id,
-                "name": name,
-                "data": dict(data or {}),
-            },
-        )
-        action = self.event_store.append(
+        next_revision = revision + 1
+        normalized_action = name.lower()
+        if normalized_action in {"approve", "approved", "accept", "accepted"}:
+            outcome = "approved"
+            response_summary = "已同意"
+        elif normalized_action in {"reject", "rejected", "deny", "denied", "decline"}:
+            outcome = "rejected"
+            response_summary = "已拒绝"
+        elif normalized_action in {"cancel", "cancelled", "canceled"}:
+            outcome = "cancelled"
+            response_summary = "已反馈给 Agent" if data.get("feedback") else "已取消"
+        else:
+            outcome = "submitted"
+            response_summary = "已提交"
+        resolved_data = {
+            "runId": run_id,
+            "interactionId": interaction_id,
+            "callId": provider_call_id,
+            "name": name,
+            "action": name,
+            "outcome": outcome,
+            "actor": "user",
+            "responseSummary": response_summary,
+            "data": data,
+            "revision": next_revision,
+            "expectedRevision": expected_revision,
+            "idempotencyKey": idempotency_key,
+        }
+        action_data = {
+            "runId": run_id,
+            "surfaceId": str(
+                interaction.data.get("surfaceId") or interaction.data.get("surface_id") or ""
+            ),
+            "interactionId": interaction_id,
+            "callId": provider_call_id,
+            "actionId": f"action-{interaction_id}",
+            "name": name,
+            "data": data,
+            "revision": next_revision,
+            "expectedRevision": expected_revision,
+            "idempotencyKey": idempotency_key,
+            "requestDigest": request_digest,
+        }
+        _, _, receipt = self.event_store.append_interaction_resolution(
             run_id,
-            "a2ui.action",
-            {
-                "runId": run_id,
-                "surfaceId": str(
-                    interaction.data.get("surfaceId") or interaction.data.get("surface_id") or ""
-                ),
-                "interactionId": interaction_id,
-                "actionId": f"action-{interaction_id}",
-                "name": name,
-                "data": dict(data or {}),
-            },
+            resolved_type=("approval.resolved" if kind == "approval" else "interaction.resolved"),
+            resolved_data=resolved_data,
+            action_data=action_data,
         )
         record.status = RunStatus.RUNNING
         self.event_store.save(record)
         self._waiting_modes.pop(run_id, None)
-        return {
-            "runId": run_id,
-            "interactionId": interaction_id,
-            "status": "resolved",
-            "eventId": action.id,
-            "resolutionEventId": resolved.id,
+        return receipt
+
+    def _expire_unresolved_interactions(
+        self,
+        record: RunRecord,
+        *,
+        on_event: Callable[[RunEvent], None] | None = None,
+    ) -> None:
+        """Close orphaned cards whenever their owning run is terminal."""
+
+        if record.status not in {
+            RunStatus.COMPLETED,
+            RunStatus.FAILED,
+            RunStatus.CANCELLED,
+            RunStatus.INTERRUPTED,
+            RunStatus.TIMED_OUT,
+        }:
+            return
+        events = self.event_store.events(record.id)
+        closed_ids = {
+            str(event.data.get("interactionId") or event.data.get("approvalId") or "")
+            for event in events
+            if event.type
+            in {
+                "a2ui.action",
+                "approval.resolved",
+                "interaction.resolved",
+                "interaction.cancelled",
+                "interaction.expired",
+            }
         }
+        pending: dict[str, RunEvent] = {}
+        for event in events:
+            if event.type != "a2ui.interaction":
+                continue
+            interaction_id = str(
+                event.data.get("interactionId") or event.data.get("interaction_id") or ""
+            )
+            if interaction_id and interaction_id not in closed_ids:
+                pending[interaction_id] = event
+        for interaction_id, requested in pending.items():
+            data = requested.data
+            expired = self.event_store.append(
+                record.id,
+                "interaction.expired",
+                {
+                    "runId": record.id,
+                    "interactionId": interaction_id,
+                    "approvalId": interaction_id,
+                    "callId": str(data.get("callId") or data.get("call_id") or ""),
+                    "kind": str(data.get("kind") or "form"),
+                    "title": data.get("title"),
+                    "message": data.get("message"),
+                    "detail": data.get("detail"),
+                    "outcome": "expired",
+                    "revision": _interaction_revision(data) + 1,
+                },
+            )
+            if on_event is not None:
+                on_event(expired)
 
     async def _capture_pcm_evidence(
         self,
@@ -830,7 +1651,12 @@ class StudioRunService:
                 "runId": record.id,
                 "surfaceId": surface_id,
                 "interactionId": approval_id,
+                "callId": event.request.call_id or approval_id,
                 "kind": "approval",
+                "title": "需要审批",
+                "message": "此次操作需要确认后才能继续。",
+                "detail": detail,
+                "revision": 1,
                 "inputSchema": {
                     "type": "object",
                     "properties": {
@@ -867,21 +1693,120 @@ class StudioRunService:
         agent_id: str,
         session_id: str,
         runtime_type: str,
+        build_id: str,
     ) -> dict[str, str]:
         if runtime_type != "codex":
             return {}
-        for previous in self.event_store.list_runs(session_id=session_id):
-            if previous.agent_id != agent_id or previous.status != RunStatus.COMPLETED:
-                continue
+        runs = self.event_store.list_runs(session_id=session_id, agent_id=agent_id)
+        thread_builds: dict[str, str] = {}
+        for previous in runs:
+            native_ref = previous.runtime_handle.get("native_ref") or {}
+            if isinstance(native_ref, dict) and native_ref.get("thread_id"):
+                # Older Studio versions also saved failed cross-build resumes.
+                # The first occurrence identifies the thread's actual home.
+                thread_builds.setdefault(str(native_ref["thread_id"]), previous.build_id)
+        for previous in reversed(runs):
+            # Each immutable build has its own CODEX_HOME and plugin snapshot.
+            # Starting a thread in that home applies the new capabilities; the
+            # transport-neutral history above preserves the Studio conversation.
+            if previous.build_id != build_id:
+                return {}
             native_ref = previous.runtime_handle.get("native_ref")
             native_ref = native_ref if isinstance(native_ref, dict) else {}
             thread_id = str(native_ref.get("thread_id") or "")
             if thread_id:
+                if thread_builds[thread_id] != build_id:
+                    return {}
                 return {"thread_id": thread_id}
         return {}
 
 
-def project_runtime_event(event: RuntimeEvent) -> tuple[str, dict[str, Any]]:
+def _plugin_event_envelope(record: RunRecord, event_type: str) -> dict[str, Any]:
+    return {
+        "schema_version": 2,
+        "event_id": f"{record.id}:{event_type}",
+        "seq": 0,
+        "timestamp": time.time(),
+        "run_id": record.id,
+        "scope_id": record.id,
+        "source": SourceRef(
+            framework="ksadk",
+            metadata={
+                "runtime": "pluginhost",
+                "agent_id": record.agent_id,
+                "session_id": record.session_id,
+                "build_id": record.build_id,
+            },
+        ),
+    }
+
+
+def _normalized_plugin_usage(usage: Mapping[str, Any]) -> dict[str, Any]:
+    def number(*keys: str) -> int:
+        for key in keys:
+            value = usage.get(key)
+            if value is not None:
+                try:
+                    return max(0, int(value))
+                except (TypeError, ValueError):
+                    return 0
+        return 0
+
+    normalized = {
+        "input_tokens": number("input_tokens", "inputTokens", "prompt_tokens"),
+        "output_tokens": number("output_tokens", "outputTokens", "completion_tokens"),
+        "total_tokens": number("total_tokens", "totalTokens"),
+        "cached_tokens": number("cached_tokens", "cachedTokens"),
+        "reasoning_tokens": number("reasoning_tokens", "reasoningTokens"),
+    }
+    if not normalized["total_tokens"]:
+        normalized["total_tokens"] = normalized["input_tokens"] + normalized["output_tokens"]
+    normalized["reported"] = bool(usage) and any(
+        key in usage
+        for key in (
+            "input_tokens",
+            "inputTokens",
+            "prompt_tokens",
+            "output_tokens",
+            "outputTokens",
+            "completion_tokens",
+            "total_tokens",
+            "totalTokens",
+        )
+    )
+    return normalized
+
+
+def _interaction_revision(data: Mapping[str, Any]) -> int:
+    """Treat malformed or historical interaction revisions as read-only."""
+
+    try:
+        return max(0, int(data.get("revision") or 0))
+    except (TypeError, ValueError):
+        return 0
+
+
+def _apply_plugin_usage(record: RunRecord, usage: Mapping[str, Any]) -> None:
+    normalized = _normalized_plugin_usage(usage)
+    if not normalized["reported"]:
+        return
+    record.usage = Usage(
+        input_tokens=normalized["input_tokens"],
+        output_tokens=normalized["output_tokens"],
+        total_tokens=normalized["total_tokens"],
+        cached_input_tokens=normalized["cached_tokens"],
+        reasoning_output_tokens=normalized["reasoning_tokens"],
+        reported=True,
+        source="pluginhost",
+    )
+
+
+def project_runtime_event(
+    event: RuntimeEvent,
+    *,
+    session_id: str | None = None,
+    public_run_id: str | None = None,
+) -> tuple[str, dict[str, Any]]:
     """Project the canonical RuntimeEvent into Studio's persisted event view.
 
     公开承诺字段（契约声明见 ``ksadk/events/projections.py``，执行形态为
@@ -1005,7 +1930,9 @@ def project_runtime_event(event: RuntimeEvent) -> tuple[str, dict[str, Any]]:
             payload = {
                 "interactionId": event.interaction_id,
                 "kind": "form",
-                "inputSchema": {},
+                "inputSchema": event.request.schema_,
+                "message": event.request.prompt or "",
+                "callId": event.source.native_event_id or event.interaction_id,
             }
     elif isinstance(event, InteractionResolved):
         if event.interaction_kind == "approval":
@@ -1045,13 +1972,22 @@ def project_runtime_event(event: RuntimeEvent) -> tuple[str, dict[str, Any]]:
         payload = {}
 
     _attach_studio_identity(payload, event)
+    if public_run_id and public_run_id != event.run_id:
+        payload["runtimeRunId"] = event.run_id
+        payload["runId"] = public_run_id
     payload["runtimeEvent"] = dump_runtime_event(event)
+    # Additive only: legacy Studio/Web consumers keep reading the established
+    # event type and payload keys.  New surfaces may opt into this typed,
+    # identity-aware representation without reconstructing one from text.
+    payload["conversationItem"] = project_conversation_item(
+        event,
+        session_id=session_id,
+        run_id=public_run_id,
+    ).model_dump(by_alias=True, exclude_none=True, mode="json")
     return projected, payload
 
 
-def _first_content(
-    snapshot: ContentSnapshot | None, content_type: type
-) -> Any | None:
+def _first_content(snapshot: ContentSnapshot | None, content_type: type) -> Any | None:
     if snapshot is None:
         return None
     for part in snapshot.parts:
@@ -1073,6 +2009,11 @@ def _project_a2ui_surface(
         projected = "a2ui.surface.end"
         data_parts = event.snapshot.parts
 
+    if event.source.metadata.get("operation_batch") is True and isinstance(event, ItemCompleted):
+        # Completion closes the immutable canonical batch; it is not a request
+        # to remove the surface that the batch just created.
+        projected = "a2ui.surface.begin"
+
     surface_id = str(event.source.metadata.get("surface_id") or "")
     operations: list[dict[str, Any]] = []
     for part in data_parts:
@@ -1080,6 +2021,8 @@ def _project_a2ui_surface(
             data = part.data
             if isinstance(data, list):
                 operations.extend(dict(op) for op in data if isinstance(op, Mapping))
+            elif isinstance(data, Mapping):
+                operations.extend(project_a2ui_operations(projected, data))
     if not operations:
         operations = project_a2ui_operations(projected, {"surface_id": surface_id})
     payload: dict[str, Any] = {
@@ -1122,6 +2065,44 @@ def _studio_envelope_projection(envelope) -> tuple[str, dict[str, Any]] | None:
     """Session envelope -> Studio RunEvent 投影；cursor 仍用 envelope.seq。"""
 
     payload = envelope.payload or {}
+    # Kernel RuntimeEvent is persisted as a typed runtime/v2 SessionEvent
+    # envelope.  Reuse the exact same projector as the direct Studio path so
+    # a consumer receives its additive ConversationItem regardless of which
+    # ingress delivered the Run.  Legacy event families retain the historical
+    # text-only fallback below.
+    if envelope.family == "runtime" and envelope.family_version == 2:
+        try:
+            runtime_event = parse_runtime_event(payload)
+        except (TypeError, ValueError):
+            # A damaged/unknown runtime payload must not make old Studio
+            # subscriptions fail.  Preserve its event type for legacy
+            # observability while refusing to invent a typed conversation item.
+            return envelope.event_type, {"runId": envelope.run_id or ""}
+        return project_runtime_event(runtime_event, session_id=envelope.session_id)
+    if envelope.family == "interaction" and envelope.family_version == 1:
+        conversation_item = project_interaction_conversation_item(envelope)
+        if conversation_item is None:
+            # Keep a malformed durable fact observable without reusing an
+            # actionable legacy event name.  Existing Studio reducers turn
+            # ``approval.requested`` into a submit button, so emitting that
+            # name without an authoritative revision would bypass the typed
+            # ConversationItem fail-closed boundary.
+            payload = envelope.payload or {}
+            return envelope.event_type, {
+                "runId": envelope.run_id or str(payload.get("run_id") or ""),
+                "itemId": str(payload.get("interaction_id") or envelope.event_id),
+                "interactionReadOnly": True,
+            }
+        projected = _project_interaction_envelope_legacy(envelope)
+        if projected is None:
+            return None
+        event_type, data = projected
+        data["conversationItem"] = conversation_item.model_dump(
+            by_alias=True,
+            exclude_none=True,
+            mode="json",
+        )
+        return event_type, data
     if envelope.event_type == "run.completed":
         return "run.completed", {
             "runId": envelope.run_id or "",
@@ -1131,3 +2112,70 @@ def _studio_envelope_projection(envelope) -> tuple[str, dict[str, Any]] | None:
     if text:
         return "message.delta", {"delta": text}
     return None
+
+
+def _project_interaction_envelope_legacy(
+    envelope,
+) -> tuple[str, dict[str, Any]] | None:
+    """Keep established Studio event names while Interaction/v1 owns truth."""
+
+    payload = envelope.payload or {}
+    interaction_id = str(payload.get("interaction_id") or "")
+    interaction_kind = str(payload.get("kind") or "")
+    revision = payload.get("revision")
+    request = payload.get("request")
+    request = request if isinstance(request, Mapping) else {}
+    presentation = request.get("presentation")
+    presentation = presentation if isinstance(presentation, Mapping) else {}
+    common: dict[str, Any] = {
+        "runId": envelope.run_id or str(payload.get("run_id") or ""),
+        "itemId": interaction_id,
+        "interactionId": interaction_id,
+    }
+    # Expose the value as received for legacy/read-only diagnostics.  Only the
+    # typed ConversationItem validates it as an authoritative writable token.
+    if revision is not None:
+        common["revision"] = revision
+
+    if envelope.event_type == "interaction.requested":
+        if interaction_kind == "approval":
+            return "approval.requested", {
+                **common,
+                "approvalId": interaction_id,
+                "callId": "",
+                "kind": str(presentation.get("title") or interaction_kind),
+                "detail": presentation.get("description"),
+            }
+        return "a2ui.interaction", {
+            **common,
+            "kind": interaction_kind or "form",
+            "inputSchema": (
+                dict(request.get("request_schema"))
+                if isinstance(request.get("request_schema"), Mapping)
+                else {}
+            ),
+        }
+    if envelope.event_type in {
+        "interaction.resolved",
+        "interaction.cancelled",
+        "interaction.expired",
+    }:
+        outcome = str(
+            payload.get("outcome")
+            or (
+                "cancelled"
+                if envelope.event_type == "interaction.cancelled"
+                else "expired"
+                if envelope.event_type == "interaction.expired"
+                else ""
+            )
+        )
+        if interaction_kind == "approval":
+            return "approval.resolved", {
+                **common,
+                "approvalId": interaction_id,
+                "callId": "",
+                "decision": outcome,
+            }
+        return "a2ui.action", {**common, "name": outcome}
+    return None