Merge branch 'anthropics:main' into main

Author: Mng-dev-ai

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 0.1.39
+
+### Internal/Other Changes
+
+- Updated bundled Claude CLI to version 2.1.49
+
+## 0.1.38
+
+### Internal/Other Changes
+
+- Updated bundled Claude CLI to version 2.1.47
+
+## 0.1.37
+
+### Internal/Other Changes
+
+- Updated bundled Claude CLI to version 2.1.44
+
 ## 0.1.36
 
 ### New Features

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "claude-agent-sdk"
-version = "0.1.36"
+version = "0.1.39"
 description = "Python SDK for Claude Code"
 readme = "README.md"
 requires-python = ">=3.10"

src/claude_agent_sdk/_cli_version.py

@@ -1,3 +1,3 @@
 """Bundled Claude Code CLI version."""
 
-__cli_version__ = "2.1.42"
+__cli_version__ = "2.1.49"

src/claude_agent_sdk/_internal/client.py

@@ -136,9 +136,11 @@ async def process_query(
                 # Stream input in background for async iterables
                 query._tg.start_soon(query.stream_input, prompt)
 
-            # Yield parsed messages
+            # Yield parsed messages, skipping unknown message types
             async for data in query.receive_messages():
-                yield parse_message(data)
+                message = parse_message(data)
+                if message is not None:
+                    yield message
 
         finally:
             await query.close()

src/claude_agent_sdk/_internal/message_parser.py

@@ -21,7 +21,7 @@
 logger = logging.getLogger(__name__)
 
 
-def parse_message(data: dict[str, Any]) -> Message:
+def parse_message(data: dict[str, Any]) -> Message | None:
     """
     Parse message from CLI output into typed Message objects.
 
@@ -178,4 +178,7 @@ def parse_message(data: dict[str, Any]) -> Message:
                 ) from e
 
         case _:
-            raise MessageParseError(f"Unknown message type: {message_type}", data)
+            # Forward-compatible: skip unrecognized message types so newer
+            # CLI versions don't crash older SDK versions.
+            logger.debug("Skipping unknown message type: %s", message_type)
+            return None

src/claude_agent_sdk/_version.py

@@ -1,3 +1,3 @@
 """Version information for claude-agent-sdk."""
 
-__version__ = "0.1.36"
+__version__ = "0.1.39"

src/claude_agent_sdk/client.py

@@ -184,7 +184,9 @@ async def receive_messages(self) -> AsyncIterator[Message]:
         from ._internal.message_parser import parse_message
 
         async for data in self._query.receive_messages():
-            yield parse_message(data)
+            message = parse_message(data)
+            if message is not None:
+                yield message
 
     async def query(
         self, prompt: str | AsyncIterable[dict[str, Any]], session_id: str = "default"

tests/test_message_parser.py

@@ -328,10 +328,9 @@ def test_parse_missing_type_field(self):
         assert "Message missing 'type' field" in str(exc_info.value)
 
     def test_parse_unknown_message_type(self):
-        """Test that unknown message type raises MessageParseError."""
-        with pytest.raises(MessageParseError) as exc_info:
-            parse_message({"type": "unknown_type"})
-        assert "Unknown message type: unknown_type" in str(exc_info.value)
+        """Test that unknown message type returns None for forward compatibility."""
+        result = parse_message({"type": "unknown_type"})
+        assert result is None
 
     def test_parse_user_message_missing_fields(self):
         """Test that user message with missing fields raises MessageParseError."""
@@ -359,7 +358,8 @@ def test_parse_result_message_missing_fields(self):
 
     def test_message_parse_error_contains_data(self):
         """Test that MessageParseError contains the original data."""
-        data = {"type": "unknown", "some": "data"}
+        # Use a malformed known type (missing required fields) to trigger error
+        data = {"type": "assistant"}
         with pytest.raises(MessageParseError) as exc_info:
             parse_message(data)
         assert exc_info.value.data == data

tests/test_rate_limit_event_repro.py

@@ -0,0 +1,79 @@
+"""Repro test: rate_limit_event message type crashes the Python Agent SDK.
+
+CLI v2.1.45+ emits `rate_limit_event` messages when rate limit status changes
+for claude.ai subscription users. The Python SDK's message parser had no handler
+for this message type, causing a MessageParseError crash.
+
+Fix: the parser now returns None for unknown message types, and the caller
+filters them out. This makes the SDK forward-compatible with new CLI message types.
+
+See: https://github.com/anthropics/claude-agent-sdk-python/issues/583
+"""
+
+from claude_agent_sdk._internal.message_parser import parse_message
+
+
+class TestRateLimitEventHandling:
+    """Verify rate_limit_event and unknown message types don't crash."""
+
+    def test_rate_limit_event_returns_none(self):
+        """rate_limit_event should be silently skipped, not crash."""
+        data = {
+            "type": "rate_limit_event",
+            "rate_limit_info": {
+                "status": "allowed_warning",
+                "resetsAt": 1700000000,
+                "rateLimitType": "five_hour",
+                "utilization": 0.85,
+                "isUsingOverage": False,
+            },
+            "uuid": "550e8400-e29b-41d4-a716-446655440000",
+            "session_id": "test-session-id",
+        }
+
+        result = parse_message(data)
+        assert result is None
+
+    def test_rate_limit_event_rejected_returns_none(self):
+        """Hard rate limit (status=rejected) should also be skipped."""
+        data = {
+            "type": "rate_limit_event",
+            "rate_limit_info": {
+                "status": "rejected",
+                "resetsAt": 1700003600,
+                "rateLimitType": "seven_day",
+                "isUsingOverage": False,
+                "overageStatus": "rejected",
+                "overageDisabledReason": "out_of_credits",
+            },
+            "uuid": "660e8400-e29b-41d4-a716-446655440001",
+            "session_id": "test-session-id",
+        }
+
+        result = parse_message(data)
+        assert result is None
+
+    def test_unknown_message_type_returns_none(self):
+        """Any unknown message type should return None for forward compatibility."""
+        data = {
+            "type": "some_future_event_type",
+            "uuid": "770e8400-e29b-41d4-a716-446655440002",
+            "session_id": "test-session-id",
+        }
+
+        result = parse_message(data)
+        assert result is None
+
+    def test_known_message_types_still_parsed(self):
+        """Known message types should still be parsed normally."""
+        data = {
+            "type": "assistant",
+            "message": {
+                "content": [{"type": "text", "text": "hello"}],
+                "model": "claude-sonnet-4-6-20250929",
+            },
+        }
+
+        result = parse_message(data)
+        assert result is not None
+        assert result.content[0].text == "hello"