Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/claude_agent_sdk/_internal/message_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ def parse_message(data: dict[str, Any]) -> Message | None:
stop_reason=data["message"].get("stop_reason"),
session_id=data.get("session_id"),
uuid=data.get("uuid"),
raw=data,
)
except KeyError as e:
raise MessageParseError(
Expand Down Expand Up @@ -295,6 +296,7 @@ def parse_message(data: dict[str, Any]) -> Message | None:
errors=data.get("errors"),
api_error_status=data.get("api_error_status"),
uuid=data.get("uuid"),
raw=data,
)
except KeyError as e:
raise MessageParseError(
Expand Down
2 changes: 2 additions & 0 deletions src/claude_agent_sdk/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,7 @@ class AssistantMessage:
stop_reason: str | None = None
session_id: str | None = None
uuid: str | None = None
raw: dict[str, Any] = field(default_factory=dict)


@dataclass
Expand Down Expand Up @@ -1220,6 +1221,7 @@ class ResultMessage:
# Emitted by the CLI since v2.1.110. Safe to log (no message content).
api_error_status: int | None = None
uuid: str | None = None
raw: dict[str, Any] = field(default_factory=dict)


@dataclass
Expand Down
81 changes: 81 additions & 0 deletions tests/test_message_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -1227,3 +1227,84 @@ def test_parse_hook_event_message_minimal(self):
assert message.hook_event_name == "Stop"
assert message.session_id is None
assert message.uuid is None


class TestRawFieldPassthrough:
"""Tests for raw field passthrough on ResultMessage and AssistantMessage (#1026)."""

def test_result_message_raw_contains_full_wire_data(self):
"""ResultMessage.raw stores the original wire dict including unknown fields."""
data = {
"type": "result",
"subtype": "success",
"duration_ms": 1000,
"duration_api_ms": 800,
"is_error": False,
"num_turns": 1,
"session_id": "sess_123",
"ttft_ms": 250,
"terminal_reason": "end_turn",
"stop_details": {"reason": "max_tokens"},
}
msg = parse_message(data)
assert isinstance(msg, ResultMessage)
assert msg.raw["ttft_ms"] == 250
assert msg.raw["terminal_reason"] == "end_turn"
assert msg.raw["stop_details"] == {"reason": "max_tokens"}

def test_result_message_raw_is_same_dict(self):
"""ResultMessage.raw is the exact input dict."""
data = {
"type": "result",
"subtype": "success",
"duration_ms": 0,
"duration_api_ms": 0,
"is_error": False,
"num_turns": 0,
"session_id": "s",
}
msg = parse_message(data)
assert isinstance(msg, ResultMessage)
assert msg.raw is data

def test_assistant_message_raw_contains_full_wire_data(self):
"""AssistantMessage.raw stores the original wire dict including unknown fields."""
data = {
"type": "assistant",
"message": {
"content": [{"type": "text", "text": "hi"}],
"model": "claude-opus-4-5",
"usage": {"input_tokens": 10, "output_tokens": 5},
},
"session_id": "sess_abc",
"future_field": "future_value",
}
msg = parse_message(data)
assert isinstance(msg, AssistantMessage)
assert msg.raw["future_field"] == "future_value"
assert msg.raw["session_id"] == "sess_abc"

def test_assistant_message_raw_is_same_dict(self):
"""AssistantMessage.raw is the exact input dict."""
data = {
"type": "assistant",
"message": {
"content": [],
"model": "claude-sonnet-4-6",
},
}
msg = parse_message(data)
assert isinstance(msg, AssistantMessage)
assert msg.raw is data

def test_result_message_raw_defaults_to_empty_dict(self):
"""ResultMessage constructed directly has raw={}."""
msg = ResultMessage(
subtype="success",
duration_ms=0,
duration_api_ms=0,
is_error=False,
num_turns=0,
session_id="s",
)
assert msg.raw == {}