deepstrike 0.2.71__tar.gz → 0.2.72__tar.gz

{deepstrike-0.2.71 → deepstrike-0.2.72}/Cargo.lock

@@ -254,7 +254,7 @@ dependencies = [
 
 [[package]]
 name = "deepstrike-core"
-version = "0.2.71"
+version = "0.2.72"
 dependencies = [
  "compact_str",
  "deepstrike-tokenizer",
@@ -268,7 +268,7 @@ dependencies = [
 
 [[package]]
 name = "deepstrike-node"
-version = "0.2.71"
+version = "0.2.72"
 dependencies = [
  "compact_str",
  "deepstrike-core",
@@ -280,7 +280,7 @@ dependencies = [
 
 [[package]]
 name = "deepstrike-py"
-version = "0.2.71"
+version = "0.2.72"
 dependencies = [
  "compact_str",
  "deepstrike-core",
@@ -291,7 +291,7 @@ dependencies = [
 
 [[package]]
 name = "deepstrike-sdk"
-version = "0.2.71"
+version = "0.2.72"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -327,7 +327,7 @@ dependencies = [
 
 [[package]]
 name = "deepstrike-tokenizer"
-version = "0.2.71"
+version = "0.2.72"
 dependencies = [
  "pretty_assertions",
  "tiktoken-rs",
@@ -335,7 +335,7 @@ dependencies = [
 
 [[package]]
 name = "deepstrike-wasm"
-version = "0.2.71"
+version = "0.2.72"
 dependencies = [
  "compact_str",
  "deepstrike-core",

{deepstrike-0.2.71 → deepstrike-0.2.72}/Cargo.toml

@@ -3,13 +3,13 @@ resolver = "2"
 members = ["crates/deepstrike-core", "crates/deepstrike-tokenizer", "crates/deepstrike-py"]
 
 [workspace.package]
-version = "0.2.71"
+version = "0.2.72"
 edition = "2024"
 repository = "https://github.com/kongusen/deepstrike"
 
 [workspace.dependencies]
-deepstrike-core = { path = "crates/deepstrike-core", version = "0.2.71" }
-deepstrike-tokenizer = { path = "crates/deepstrike-tokenizer", version = "0.2.71" }
+deepstrike-core = { path = "crates/deepstrike-core", version = "0.2.72" }
+deepstrike-tokenizer = { path = "crates/deepstrike-tokenizer", version = "0.2.72" }
 notify = "6"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

{deepstrike-0.2.71 → deepstrike-0.2.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepstrike
-Version: 0.2.71
+Version: 0.2.72
 Requires-Dist: httpx>=0.27
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: anyio>=4.0

{deepstrike-0.2.71 → deepstrike-0.2.72}/crates/deepstrike-py/src/lib.rs

@@ -336,7 +336,7 @@ impl ContentPartObj {
 
 #[pyclass]
 #[derive(Clone)]
-struct ProviderMessage {
+struct ModelMessage {
     #[pyo3(get, set)]
     role: String,
     #[pyo3(get, set)]
@@ -348,7 +348,7 @@ struct ProviderMessage {
 }
 
 #[pymethods]
-impl ProviderMessage {
+impl ModelMessage {
     #[new]
     #[pyo3(signature = (role, content, tool_calls = None, content_parts = None))]
     fn new(
@@ -371,7 +371,7 @@ impl ProviderMessage {
             None => String::new(),
         };
         format!(
-            "ProviderMessage(role={:?}, content={:?}{})",
+            "ModelMessage(role={:?}, content={:?}{})",
             self.role, self.content, parts_info
         )
     }
@@ -535,7 +535,7 @@ fn content_part_from_rust(p: &ContentPart) -> ContentPartObj {
     }
 }
 
-impl ProviderMessage {
+impl ModelMessage {
     fn from_rust(msg: &RustMessage) -> Self {
         let role = match msg.role {
             Role::System => "system",
@@ -728,7 +728,7 @@ struct LoopResult {
     #[pyo3(get)]
     termination: String,
     #[pyo3(get)]
-    final_message: Option<ProviderMessage>,
+    final_message: Option<ModelMessage>,
     #[pyo3(get)]
     turns_used: u32,
     #[pyo3(get)]
@@ -841,10 +841,10 @@ struct RenderedContext {
     system_knowledge: String,
     /// History turns only — the stable, cacheable message prefix.
     #[pyo3(get)]
-    turns: Vec<ProviderMessage>,
+    turns: Vec<ModelMessage>,
     /// Volatile State turn (task_state + signals), rendered after the cacheable history.
     #[pyo3(get)]
-    state_turn: Option<ProviderMessage>,
+    state_turn: Option<ModelMessage>,
     /// P1-E: count of leading `turns` forming the frozen prefix (byte-stable until the next
     /// compaction). Providers pin a deep cache breakpoint here; absent ⇒ rolling-pair fallback.
     #[pyo3(get)]
@@ -1396,7 +1396,7 @@ struct SessionData {
     #[pyo3(get, set)]
     agent_id: String,
     #[pyo3(get, set)]
-    messages: Vec<ProviderMessage>,
+    messages: Vec<ModelMessage>,
     /// JSON-encoded metadata blob.
     #[pyo3(get, set)]
     metadata: String,
@@ -1413,7 +1413,7 @@ impl SessionData {
     fn new(
         session_id: String,
         agent_id: String,
-        messages: Vec<ProviderMessage>,
+        messages: Vec<ModelMessage>,
         metadata: String,
         created_at_ms: f64,
         updated_at_ms: f64,
@@ -1693,7 +1693,7 @@ fn build_eval_messages(
     result: String,
     attempt: u32,
     extract_skill_on_pass: bool,
-) -> Vec<ProviderMessage> {
+) -> Vec<ModelMessage> {
     let rust_criteria = criteria_from_py(criteria);
     rust_build_eval_messages(
         &goal,
@@ -1703,7 +1703,7 @@ fn build_eval_messages(
         extract_skill_on_pass,
     )
     .iter()
-    .map(ProviderMessage::from_rust)
+    .map(ModelMessage::from_rust)
     .collect()
 }
 
@@ -1756,7 +1756,7 @@ fn _kernel(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add("ABI", deepstrike_core::runtime::kernel::wire::ABI)?;
     // POD types
     m.add_class::<ContentPartObj>()?;
-    m.add_class::<ProviderMessage>()?;
+    m.add_class::<ModelMessage>()?;
     m.add_class::<ToolCall>()?;
     m.add_class::<ToolExecutionResult>()?;
     m.add_class::<ToolSchema>()?;

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/__init__.py

@@ -6,7 +6,7 @@ except PackageNotFoundError:
     __version__ = "0+unknown"
 
 from deepstrike._kernel import (
-    ProviderMessage, ToolCall, ToolExecutionResult, ToolSchema,
+    ModelMessage, ToolCall, ToolExecutionResult, ToolSchema,
     SkillMetadata,
 )
 from deepstrike.runtime import (
@@ -378,7 +378,7 @@ __all__ = [
     "KnowledgeSource",
     "RuntimeSignal", "SignalClaim", "SignalDeliveryReceipt",
     "SignalSource", "ScheduledPrompt", "SignalGateway",
-    "ProviderMessage", "ToolCall", "ToolExecutionResult", "ToolSchema",
+    "ModelMessage", "ToolCall", "ToolExecutionResult", "ToolSchema",
     "SkillMetadata",
     # Sub-agent isolation
     "AgentIdentity", "AgentCapabilityFilter", "AgentRunSpec",

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/memory/extraction.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import json
 from typing import Any
 
-from deepstrike._kernel import ProviderMessage
+from deepstrike._kernel import ModelMessage
 from deepstrike.memory.protocols import MemoryProvenance, MemoryRecord, MemoryScope, SessionData
 from deepstrike.providers.base import RenderedContext
 from deepstrike.providers.stream import TextDelta
@@ -20,7 +20,7 @@ async def extract_session_memories(provider: Any, session: SessionData, scope: M
             system_prompt,
             "Extract durable, reusable facts from this completed session. Return only JSON; do not include transient progress or guesses.",
         ])),
-        turns=[ProviderMessage(
+        turns=[ModelMessage(
             role="user",
             content=(transcript + '\n\nReturn {"memories":[{"name":"stable-kebab-key",'
                      '"kind":"user|feedback|project|reference","content":"fact",'

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/memory/protocols.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any, Literal, Protocol, runtime_checkable
 
 if TYPE_CHECKING:
-    from deepstrike._kernel import ProviderMessage
+    from deepstrike._kernel import ModelMessage
 
 
 # ─── Durable-memory types ────────────────────────────────────────────────────
@@ -101,8 +101,8 @@ class MemoryStore(Protocol):
 class SessionData:
     session_id: str
     agent_id: str
-    """ProviderMessage objects using the kernel message contract."""
-    messages: list["ProviderMessage"]
+    """ModelMessage objects using the kernel message contract."""
+    messages: list["ModelMessage"]
     metadata: Any = None
     created_at_ms: int = 0
     updated_at_ms: int = 0

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/providers/anthropic.py

@@ -6,7 +6,7 @@ import logging
 from types import SimpleNamespace
 from typing import AsyncIterator
 from anthropic import AsyncAnthropic
-from deepstrike._kernel import ProviderMessage, ToolCall, ToolSchema
+from deepstrike._kernel import ModelMessage, ToolCall, ToolSchema
 from .stream import StreamEvent
 from .base import RetryConfig, CircuitBreaker, ProviderDescriptor, RenderedContext, RuntimePolicy, normalize_tool_call, parse_tool_arguments, to_anthropic_content, to_anthropic_messages
 from .anthropic_adapter import AnthropicMessagesAdapter
@@ -98,7 +98,7 @@ class AnthropicProvider:
             blocks.append({"type": "text", "text": knowledge, **cc})
         return blocks or None
 
-    def _build_messages(self, turns: list[ProviderMessage], state_turn=None, frozen_prefix_len=None, strategy: str = "default", cache_control: dict | None = None) -> list[dict]:
+    def _build_messages(self, turns: list[ModelMessage], state_turn=None, frozen_prefix_len=None, strategy: str = "default", cache_control: dict | None = None) -> list[dict]:
         msgs = to_anthropic_messages(
             turns,
             native_replay=lambda message: self._native_assistant_blocks.get(
@@ -191,7 +191,7 @@ class AnthropicProvider:
             confidence="exact",
         )
 
-    async def complete(self, context: RenderedContext, tools: list[ToolSchema], extensions: dict | None = None) -> ProviderMessage:
+    async def complete(self, context: RenderedContext, tools: list[ToolSchema], extensions: dict | None = None) -> ModelMessage:
         if self._circuit.is_open():
             raise RuntimeError("Circuit breaker open")
 
@@ -238,7 +238,7 @@ class AnthropicProvider:
         if finalized.replay:
             self._remember_native_blocks(stream_state.final_text, stream_state.final_tool_calls, finalized.replay["native_blocks"])
 
-    def _assistant_replay_key(self, message: ProviderMessage) -> str:
+    def _assistant_replay_key(self, message: ModelMessage) -> str:
         return self._assistant_replay_key_parts(message.content, message.tool_calls or [])
 
     def _assistant_replay_key_parts(self, content: str, tool_calls: list[ToolCall]) -> str:
@@ -317,7 +317,7 @@ def _apply_message_cache_control(msgs: list[dict], frozen_prefix_len: "int | Non
     body is promoted to a cache-bearing text block."""
     if not msgs:
         return
-    # ProviderMessage-level cache_control is emitted under "default" and "frozen-prefix" only.
+    # ModelMessage-level cache_control is emitted under "default" and "frozen-prefix" only.
     if strategy in ("tools-only", "system-only", "none"):
         return
     targets = {len(msgs) - 1}

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/providers/anthropic_adapter.py

@@ -6,7 +6,7 @@ import math
 from dataclasses import dataclass, field
 from typing import Any
 
-from deepstrike._kernel import ProviderMessage, ToolCall, ToolSchema
+from deepstrike._kernel import ModelMessage, ToolCall, ToolSchema
 from deepstrike.providers.base import normalize_tool_call, parse_tool_arguments, to_anthropic_messages
 from deepstrike.providers.protocol_adapter import AdapterOutput, ProtocolResponseError
 from deepstrike.providers.stop_reason import canonicalize_stop_reason
@@ -171,7 +171,7 @@ class AnthropicMessagesAdapter:
             },
         )
 
-    def decode_complete(self, raw: Any, input: CanonicalAdapterInput) -> tuple[ProviderMessage, dict | None]:
+    def decode_complete(self, raw: Any, input: CanonicalAdapterInput) -> tuple[ModelMessage, dict | None]:
         content = ""
         calls: list[ToolCall] = []
         native_blocks: list[dict] = []
@@ -194,7 +194,7 @@ class AnthropicMessagesAdapter:
         ):
             raise _textual_tool_call_error()
         usage = self.normalize_usage(_get(raw, "usage"))
-        message = ProviderMessage(role="assistant", content=content, tool_calls=calls or None)
+        message = ModelMessage(role="assistant", content=content, tool_calls=calls or None)
         return message, ({"native_blocks": native_blocks} if native_blocks else None)
 
     def create_stream_state(self, input: CanonicalAdapterInput, cache_slots: dict[str, bool] | None = None) -> AnthropicStreamState:

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/providers/base.py

@@ -5,7 +5,7 @@ import logging
 import time
 from typing import Any, AsyncIterator, Callable, Protocol, TypeVar, runtime_checkable
 from dataclasses import dataclass, field
-from deepstrike._kernel import ProviderMessage, ToolCall, ToolSchema
+from deepstrike._kernel import ModelMessage, ToolCall, ToolSchema
 from .stream import StreamEvent
 from deepstrike.types.content import (
     normalize_canonical_adapter_input,
@@ -159,8 +159,8 @@ def _tool_result_anthropic_content(p: Any) -> "str | list[dict]":
   return p.output
 
 
-def to_anthropic_content(msg: ProviderMessage) -> str | list[dict]:
-    """Convert ProviderMessage to Anthropic API content format."""
+def to_anthropic_content(msg: ModelMessage) -> str | list[dict]:
+    """Convert ModelMessage to Anthropic API content format."""
     validate_rendered_message(msg)
     if not getattr(msg, "content_parts", None):
         return msg.content
@@ -201,8 +201,8 @@ def _openai_audio_format(media_type: str | None) -> str:
     return sub
 
 
-def to_openai_content(msg: ProviderMessage) -> str | list[dict]:
-    """Convert ProviderMessage to OpenAI API content format."""
+def to_openai_content(msg: ModelMessage) -> str | list[dict]:
+    """Convert ModelMessage to OpenAI API content format."""
     validate_rendered_message(msg)
     if not getattr(msg, "content_parts", None):
         return msg.content
@@ -231,8 +231,8 @@ def to_openai_content(msg: ProviderMessage) -> str | list[dict]:
 
 
 def to_anthropic_messages(
-    turns: list[ProviderMessage],
-    native_replay: Callable[[ProviderMessage], list[dict] | None] | None = None,
+    turns: list[ModelMessage],
+    native_replay: Callable[[ModelMessage], list[dict] | None] | None = None,
     resolved=None,
 ) -> list[dict]:
     """Serialize provider-neutral turns into Anthropic-native messages."""
@@ -403,7 +403,7 @@ class ContextBudgetOverflow:
 @dataclass
 class RenderedContext:
     system_text: str = ""
-    turns: list[ProviderMessage] = field(default_factory=list)
+    turns: list[ModelMessage] = field(default_factory=list)
     # Identity partition (Anthropic system[0] with cache_control). Empty when the
     # kernel did not partition the system prompt.
     system_stable: str = ""
@@ -412,7 +412,7 @@ class RenderedContext:
     # Volatile State turn (task_state + signals), rendered after the cacheable
     # history. None when produced by an older binding — then the State turn is
     # still inside turns[0] and providers render turns as-is.
-    state_turn: "ProviderMessage | None" = None
+    state_turn: "ModelMessage | None" = None
     # P1-E: count of leading turns forming the frozen prefix (byte-stable until the
     # next compaction). The Anthropic provider pins a deep cache breakpoint here and
     # rolls the other at the tail; None ⇒ rolling-pair fallback.
@@ -450,7 +450,7 @@ class ProviderDescriptor:
 
 @runtime_checkable
 class LLMProvider(Protocol):
-    async def complete(self, context: RenderedContext, tools: list[ToolSchema], extensions: dict | None = None) -> ProviderMessage: ...
+    async def complete(self, context: RenderedContext, tools: list[ToolSchema], extensions: dict | None = None) -> ModelMessage: ...
     def stream(
         self,
         context: RenderedContext,

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/providers/gemini.py

@@ -8,7 +8,7 @@ try:
     from google import genai as google_genai
 except ImportError:  # pragma: no cover - exercised only when optional provider dep is absent.
     google_genai = None
-from deepstrike._kernel import ProviderMessage, ToolSchema
+from deepstrike._kernel import ModelMessage, ToolSchema
 from .stream import StreamEvent
 from .base import RetryConfig, CircuitBreaker, RenderedContext, RuntimePolicy
 from .gemini_adapter import GeminiAdapter
@@ -63,7 +63,7 @@ class GeminiProvider:
     def runtime_policy(self) -> RuntimePolicy:
         return _GEMINI_POLICIES.get(self._model_name, RuntimePolicy())
 
-    def _build_contents(self, turns: list[ProviderMessage]) -> list[dict]:
+    def _build_contents(self, turns: list[ModelMessage]) -> list[dict]:
         return self._adapter.build_contents(turns)
 
     def _build_tools(self, tools: list[ToolSchema]) -> list[dict] | None:
@@ -140,7 +140,7 @@ class GeminiProvider:
             confidence="exact",
         )
 
-    async def complete(self, context: RenderedContext, tools: list[ToolSchema], extensions: dict | None = None) -> ProviderMessage:
+    async def complete(self, context: RenderedContext, tools: list[ToolSchema], extensions: dict | None = None) -> ModelMessage:
         if self._circuit.is_open():
             raise RuntimeError("Circuit breaker open")
 

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/providers/gemini_adapter.py

@@ -6,7 +6,7 @@ import math
 from dataclasses import dataclass, field
 from typing import Any
 
-from deepstrike._kernel import ProviderMessage, ToolSchema
+from deepstrike._kernel import ModelMessage, ToolSchema
 from deepstrike.providers.base import RenderedContext, UnsupportedModalityError
 from deepstrike.providers.protocol_adapter import AdapterOutput, ProtocolResponseError
 from deepstrike.providers.stop_reason import canonicalize_stop_reason
@@ -53,7 +53,7 @@ class GeminiAdapter:
     def __init__(self, model: str):
         self._model = model
 
-    def build_contents(self, turns: list[ProviderMessage]) -> list[dict]:
+    def build_contents(self, turns: list[ModelMessage]) -> list[dict]:
         contents: list[dict] = []
         for msg in turns:
             if msg.role == "tool":
@@ -153,7 +153,7 @@ class GeminiAdapter:
     def _function_call(part: Any) -> Any:
         return _get(part, "function_call")
 
-    def decode_complete(self, raw: Any, input: CanonicalAdapterInput) -> ProviderMessage:
+    def decode_complete(self, raw: Any, input: CanonicalAdapterInput) -> ModelMessage:
         content = ""
         tool_calls = []
         for part in self._response_parts(raw):
@@ -172,7 +172,7 @@ class GeminiAdapter:
                         tool_calls.append(normalized)
         usage = _get(raw, "usage_metadata")
         total = _usage_number(usage, "total_token_count") if usage is not None else None
-        return ProviderMessage(role="assistant", content=content, tool_calls=tool_calls or None)
+        return ModelMessage(role="assistant", content=content, tool_calls=tool_calls or None)
 
     def create_stream_state(self, input: CanonicalAdapterInput) -> GeminiStreamState:
         return GeminiStreamState()

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/providers/ollama.py

@@ -4,7 +4,7 @@ from .prepared_request import PreparedProviderRequest
 import logging
 from typing import AsyncIterator
 import httpx
-from deepstrike._kernel import ProviderMessage, ToolSchema
+from deepstrike._kernel import ModelMessage, ToolSchema
 from .stream import StreamEvent
 from .base import RetryConfig, CircuitBreaker, RenderedContext, RuntimePolicy
 from .ollama_adapter import OllamaAdapter
@@ -55,7 +55,7 @@ class OllamaProvider:
         body["stream"] = stream
         return body
 
-    async def complete(self, context: RenderedContext, tools: list[ToolSchema], extensions: dict | None = None) -> ProviderMessage:
+    async def complete(self, context: RenderedContext, tools: list[ToolSchema], extensions: dict | None = None) -> ModelMessage:
         if self._circuit.is_open():
             raise Exception("Circuit breaker open")
 

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/providers/ollama_adapter.py

@@ -6,7 +6,7 @@ import math
 from dataclasses import dataclass, field
 from typing import Any
 
-from deepstrike._kernel import ProviderMessage, ToolSchema
+from deepstrike._kernel import ModelMessage, ToolSchema
 from deepstrike.providers.base import UnsupportedModalityError, normalize_tool_call
 from deepstrike.providers.protocol_adapter import AdapterOutput, ProtocolResponseError
 from deepstrike.providers.stop_reason import canonicalize_stop_reason
@@ -113,7 +113,7 @@ class OllamaAdapter:
     def _model_from_context(input: CanonicalAdapterInput) -> str:
         return str(input.extensions.get("model") or "")
 
-    def decode_complete(self, raw: dict, input: CanonicalAdapterInput) -> ProviderMessage:
+    def decode_complete(self, raw: dict, input: CanonicalAdapterInput) -> ModelMessage:
         message = raw.get("message") or {}
         tool_calls = []
         for call in message.get("tool_calls") or []:
@@ -121,7 +121,7 @@ class OllamaAdapter:
             normalized = normalize_tool_call(call.get("id", ""), function.get("name", ""), function.get("arguments", {}))
             if normalized:
                 tool_calls.append(normalized)
-        return ProviderMessage(role="assistant", content=message.get("content") or "", tool_calls=tool_calls or None)
+        return ModelMessage(role="assistant", content=message.get("content") or "", tool_calls=tool_calls or None)
 
     def create_stream_state(self, input: CanonicalAdapterInput) -> OllamaStreamState:
         return OllamaStreamState()

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/providers/openai.py

@@ -7,7 +7,7 @@ from dataclasses import dataclass, field
 from typing import Any, AsyncIterator
 import httpx
 from openai import AsyncOpenAI
-from deepstrike._kernel import ProviderMessage, ToolCall, ToolSchema
+from deepstrike._kernel import ModelMessage, ToolCall, ToolSchema
 from .stream import StreamEvent, TextDelta, ToolCallEvent, ThinkingDelta, UsageEvent
 from .base import RetryConfig, CircuitBreaker, ProviderDescriptor, RenderedContext, RuntimePolicy, normalize_tool_call, openai_cached_prompt_tokens, stable_prompt_cache_key, to_openai_message_params, ThinkingTagStreamExtractor, wire_request_extensions
 from .replay import ReasoningReplayMixin, assistant_replay_key
@@ -224,7 +224,7 @@ class OpenAIProvider(ReasoningReplayMixin):
             return
         if reasoning.native_tool_calls:
             envelope["tool_calls"] = reasoning.native_tool_calls
-        self.remember_replay_fields(ProviderMessage(role="assistant", content=content, tool_calls=tool_calls or None), envelope)
+        self.remember_replay_fields(ModelMessage(role="assistant", content=content, tool_calls=tool_calls or None), envelope)
 
     def assess_replayability(self, context: RenderedContext, extensions: dict | None = None) -> dict:
         """Pre-flight query: would this history validate against this provider with
@@ -382,7 +382,7 @@ class OpenAIProvider(ReasoningReplayMixin):
         context: RenderedContext,
         tools: list[ToolSchema],
         extensions: dict | None,
-    ) -> ProviderMessage:
+    ) -> ModelMessage:
         adapter_input = self._canonical_input(context, tools, extensions)
         plan = self._adapter.build_request(adapter_input, self._wire_dialect, self._replay_for_assistant)
         last_exc = None
@@ -413,7 +413,7 @@ class OpenAIProvider(ReasoningReplayMixin):
             output = self._adapter.push_stream_chunk(chunk, stream_state)
             if output.replay:
                 self.remember_replay_fields(
-                    ProviderMessage(role="assistant", content=stream_state.accumulated_content,
+                    ModelMessage(role="assistant", content=stream_state.accumulated_content,
                             tool_calls=self._adapter._final_tool_calls(stream_state.tool_call_buffers) or None),
                     output.replay,
                 )
@@ -422,14 +422,14 @@ class OpenAIProvider(ReasoningReplayMixin):
         output = self._adapter.finish_stream(stream_state)
         if output.replay:
             self.remember_replay_fields(
-                ProviderMessage(role="assistant", content=stream_state.accumulated_content,
+                ModelMessage(role="assistant", content=stream_state.accumulated_content,
                         tool_calls=self._adapter._final_tool_calls(stream_state.tool_call_buffers) or None),
                 output.replay,
             )
         for event in output.events:
             yield event
 
-    async def complete(self, context: RenderedContext, tools: list[ToolSchema], extensions: dict | None = None) -> ProviderMessage:
+    async def complete(self, context: RenderedContext, tools: list[ToolSchema], extensions: dict | None = None) -> ModelMessage:
         if self._circuit.is_open():
             raise RuntimeError("Circuit breaker open")
 
@@ -472,7 +472,7 @@ class OpenAIProvider(ReasoningReplayMixin):
                     ],
                 ))
 
-                return ProviderMessage(
+                return ModelMessage(
                     role="assistant",
                     content=content,
                     tool_calls=tool_calls or None,

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/providers/openai_chat_adapter.py

@@ -5,7 +5,7 @@ import json
 from dataclasses import dataclass, field
 from typing import Any, Callable
 
-from deepstrike._kernel import ProviderMessage, ToolCall, ToolSchema
+from deepstrike._kernel import ModelMessage, ToolCall, ToolSchema
 from deepstrike.providers.base import (
     ThinkingTagStreamExtractor,
     openai_cached_prompt_tokens,
@@ -35,7 +35,7 @@ class OpenAIChatRequestPlan:
 
 @dataclass(frozen=True)
 class OpenAIChatDecodeResult:
-    message: ProviderMessage
+    message: ModelMessage
     replay: dict[str, Any] | None = None
 
 
@@ -250,7 +250,7 @@ class OpenAIChatAdapter:
             }} for call in native_calls],
         )
         return OpenAIChatDecodeResult(
-            message=ProviderMessage(role="assistant", content=content, tool_calls=tool_calls or None),
+            message=ModelMessage(role="assistant", content=content, tool_calls=tool_calls or None),
             replay=replay,
         )
 

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/providers/openai_responses.py

@@ -19,7 +19,7 @@ from dataclasses import dataclass, field
 from types import SimpleNamespace
 from typing import Any, AsyncIterator
 from openai import AsyncOpenAI
-from deepstrike._kernel import ProviderMessage, ToolCall, ToolSchema
+from deepstrike._kernel import ModelMessage, ToolCall, ToolSchema
 from .stream import StreamEvent, TextDelta, ToolCallEvent, UsageEvent
 from .base import (
     RetryConfig,
@@ -81,7 +81,7 @@ class OpenAIResponsesStreamState:
     function_calls: dict[int, dict] = field(default_factory=dict)
 
 
-def _message_content(message: ProviderMessage) -> Any:
+def _message_content(message: ModelMessage) -> Any:
     """Responses-native content for a message: a plain string when it has no parts, else a list of
     ``input_text``/``input_image`` blocks (mirrors the Node adapter)."""
     parts = getattr(message, "content_parts", None)
@@ -167,7 +167,7 @@ class OpenAIResponsesAdapter:
 
         return input_items
 
-    def _append_message(self, input_items: list[dict], message: ProviderMessage) -> None:
+    def _append_message(self, input_items: list[dict], message: ModelMessage) -> None:
         if message.role == "assistant" and getattr(message, "tool_calls", None):
             if message.content or getattr(message, "content_parts", None):
                 input_items.append({"role": "assistant", "content": _message_content(message)})
@@ -267,7 +267,7 @@ class OpenAIResponsesAdapter:
             self._number(output_details, "reasoning_tokens")
         return normalize_usage(raw)
 
-    def decode_complete(self, raw: Any, input: CanonicalAdapterInput) -> ProviderMessage:
+    def decode_complete(self, raw: Any, input: CanonicalAdapterInput) -> ModelMessage:
         output = self._get(raw, "output") or []
         decoded = self.decode_output([
             item if isinstance(item, dict) else item.model_dump() if hasattr(item, "model_dump") else item
@@ -275,7 +275,7 @@ class OpenAIResponsesAdapter:
         ])
         usage = self._get(raw, "usage")
         self.normalize_usage(usage)
-        return ProviderMessage(role="assistant", content=decoded["content"], tool_calls=decoded["tool_calls"] or None)
+        return ModelMessage(role="assistant", content=decoded["content"], tool_calls=decoded["tool_calls"] or None)
 
     def create_stream_state(
         self,
@@ -415,7 +415,7 @@ class OpenAIResponsesProvider:
             resolved=getattr(self, "_resolved_runtime", None),
         )
 
-    async def complete(self, context: RenderedContext, tools: list[ToolSchema], extensions: dict | None = None) -> ProviderMessage:
+    async def complete(self, context: RenderedContext, tools: list[ToolSchema], extensions: dict | None = None) -> ModelMessage:
         if self._circuit.is_open():
             raise RuntimeError("Circuit breaker open")
 

{deepstrike-0.2.71 → deepstrike-0.2.72}/deepstrike/providers/protocol_adapter.py

@@ -9,7 +9,7 @@ from __future__ import annotations
 from dataclasses import dataclass, field
 from typing import Any, Generic, Protocol, TypeVar
 
-from deepstrike._kernel import ProviderMessage
+from deepstrike._kernel import ModelMessage
 from deepstrike.providers.stream import StreamEvent
 from deepstrike.types.content import CanonicalAdapterInput
 
@@ -56,7 +56,7 @@ class ProtocolAdapter(Protocol, Generic[RequestT, CompleteT, ChunkT, StateT, Fin
     protocol: str
 
     def build_request(self, input: CanonicalAdapterInput) -> RequestT: ...
-    def decode_complete(self, raw: CompleteT, input: CanonicalAdapterInput) -> ProviderMessage: ...
+    def decode_complete(self, raw: CompleteT, input: CanonicalAdapterInput) -> ModelMessage: ...
     def create_stream_state(self, input: CanonicalAdapterInput) -> StateT: ...
     def push_stream_chunk(self, chunk: ChunkT, state: StateT) -> AdapterOutput: ...
     def finish_stream(self, state: StateT, final: FinalT) -> AdapterOutput: ...