clawd-code-sdk 0.2.1__tar.gz → 0.2.2__tar.gz

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clawd-code-sdk
-Version: 0.2.1
+Version: 0.2.2
 Summary: Python SDK for Claude Code
 Project-URL: Documentation, https://github.com/phil65/claude-agent-sdk-python
 Project-URL: Homepage, https://github.com/phil65/claude-agent-sdk-python
@@ -271,7 +271,7 @@ async with ClaudeSDKClient(options=options) as client:
 See [src/clawd_code_sdk/types.py](src/clawd_code_sdk/types.py) for complete type definitions:
 
 - `ClaudeAgentOptions` - Configuration options
-- `AssistantMessage`, `UserMessage`, `SystemMessage`, `ResultMessage` - Message types
+- `AssistantMessage`, `UserMessage`, `InitSystemMessage`, `ResultMessage` - Message types
 - `TextBlock`, `ToolUseBlock`, `ToolResultBlock` - Content blocks
 
 ## Error Handling

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/README.md

@@ -238,7 +238,7 @@ async with ClaudeSDKClient(options=options) as client:
 See [src/clawd_code_sdk/types.py](src/clawd_code_sdk/types.py) for complete type definitions:
 
 - `ClaudeAgentOptions` - Configuration options
-- `AssistantMessage`, `UserMessage`, `SystemMessage`, `ResultMessage` - Message types
+- `AssistantMessage`, `UserMessage`, `InitSystemMessage`, `ResultMessage` - Message types
 - `TextBlock`, `ToolUseBlock`, `ToolResultBlock` - Content blocks
 
 ## Error Handling

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "clawd-code-sdk"
-version = "0.2.1"
+version = "0.2.2"
 description = "Python SDK for Claude Code"
 readme = "README.md"
 requires-python = ">=3.13"

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/src/clawd_code_sdk/__init__.py

@@ -61,7 +61,8 @@ from .models import (
     SubagentStartHookInput,
     SubagentStartHookSpecificOutput,
     SubagentStopHookInput,
-    SystemMessage,
+    BaseSystemMessage,
+    InitSystemMessage,
     TextBlock,
     ThinkingBlock,
     ThinkingConfig,
@@ -115,7 +116,8 @@ __all__ = [
     "UserPromptMessage",
     "UserPromptMessageContent",
     "AssistantMessage",
-    "SystemMessage",
+    "BaseSystemMessage",
+    "InitSystemMessage",
     "ResultMessage",
     "Message",
     "ClaudeAgentOptions",

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/src/clawd_code_sdk/_internal/transport/subprocess_cli.py

@@ -125,30 +125,20 @@ class SubprocessCLITransport(Transport):
 
         session = resolve_session_config(self._options.session)
         match session:
-            case NewSession(session_id=sid, persist=persist):
-                if sid is not None:
-                    cmd.extend(["--session-id", sid])
-                if not persist:
-                    cmd.append("--no-persist-session")
-            case ResumeSession(
-                session_id=sid,
-                fork=fork,
-                at_message=at_msg,
-                persist=persist,
-            ):
+            case NewSession(session_id=sid) if sid is not None:
+                cmd.extend(["--session-id", sid])
+            case ResumeSession(session_id=sid, fork=fork, at_message=at_msg):
                 cmd.extend(["--resume", sid])
                 if fork:
                     cmd.append("--fork-session")
                 if at_msg is not None:
                     cmd.extend(["--resume-session-at", at_msg])
-                if not persist:
-                    cmd.append("--no-persist-session")
-            case ContinueLatest(fork=fork, persist=persist):
+            case ContinueLatest(fork=fork):
                 cmd.append("--continue")
                 if fork:
                     cmd.append("--fork-session")
-                if not persist:
-                    cmd.append("--no-persist-session")
+        if not session.persist:
+            cmd.append("--no-persist-session")
 
         # Handle settings and sandbox: merge sandbox into settings if both are provided
         if settings_value := self._options.build_settings_value():

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/src/clawd_code_sdk/client.py

@@ -128,10 +128,10 @@ class ClaudeSDKClient:
         # JSON schema for structured output
         json_schema: dict[str, Any] | None
         match self.options.output_schema:
-            case type() as tp:
+            case type() as typ:
                 from pydantic import TypeAdapter
 
-                json_schema = TypeAdapter(tp).json_schema()
+                json_schema = TypeAdapter(typ).json_schema()
             case dict() as schema:
                 json_schema = schema
             case None:
@@ -342,7 +342,7 @@ class ClaudeSDKClient:
         - If no ResultMessage is received, the iterator continues indefinitely
 
         Yields:
-            Message: Each message received (UserMessage, AssistantMessage, SystemMessage, ResultMessage)
+            Message: Each message received (UserMessage, AssistantMessage, InitSystemMessage, ResultMessage)
 
         Example:
             ```python

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/src/clawd_code_sdk/models/__init__.py

@@ -200,9 +200,11 @@ from .content_blocks import (
 from .messages import (
     AssistantMessage,
     AssistantMessageError,
+    BaseSystemMessage,
     CompactBoundarySystemMessage,
     HookResponseSystemMessage,
     HookStartedSystemMessage,
+    InitSystemMessage,
     McpServerStatus,
     Message,
     ModelUsage,
@@ -210,7 +212,6 @@ from .messages import (
     SDKPermissionDenial,
     StatusSystemMessage,
     StreamEvent,
-    SystemMessage,
     AuthStatusMessage,
     FilesPersistedSystemMessage,
     HookProgressSystemMessage,
@@ -229,6 +230,7 @@ from .messages import (
 )
 from .options import ClaudeAgentOptions
 from .options import (
+    BaseSessionConfig,
     ContinueLatest,
     NewSession,
     ResumeSession,
@@ -337,10 +339,12 @@ __all__ = [
     # messages
     "AssistantMessage",
     "AssistantMessageError",
+    "BaseSystemMessage",
     "CompactBoundarySystemMessage",
     "ContentBlock",
     "HookResponseSystemMessage",
     "HookStartedSystemMessage",
+    "InitSystemMessage",
     "McpServerStatus",
     "Message",
     "ModelUsage",
@@ -348,7 +352,6 @@ __all__ = [
     "SDKPermissionDenial",
     "StatusSystemMessage",
     "StreamEvent",
-    "SystemMessage",
     "AuthStatusMessage",
     "FilesPersistedSystemMessage",
     "HookProgressSystemMessage",
@@ -371,6 +374,7 @@ __all__ = [
     "system_message_adapter",
     # options
     "ClaudeAgentOptions",
+    "BaseSessionConfig",
     "ContinueLatest",
     "NewSession",
     "ResumeSession",

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/src/clawd_code_sdk/models/messages.py

@@ -79,6 +79,13 @@ class BaseMessage:
     session_id: str
 
 
+@dataclass(kw_only=True)
+class BaseSystemMessage(BaseMessage):
+    """Base class for all system messages."""
+
+    type: Literal["system"] = "system"
+
+
 @dataclass(kw_only=True)
 class UserMessage(BaseMessage):
     """User message."""
@@ -164,10 +171,9 @@ class Plugin:
 
 
 @dataclass(kw_only=True)
-class SystemMessage(BaseMessage):
-    """System message with metadata."""
+class InitSystemMessage(BaseSystemMessage):
+    """System init message with session metadata."""
 
-    type: Literal["system"] = "system"
     subtype: Literal["init"] = "init"
     apiKeySource: ApiKeySource | None = None  # noqa: N815
     cwd: str
@@ -185,10 +191,9 @@ class SystemMessage(BaseMessage):
 
 
 @dataclass(kw_only=True)
-class HookStartedSystemMessage(BaseMessage):
-    """System message with metadata."""
+class HookStartedSystemMessage(BaseSystemMessage):
+    """System message emitted when a hook starts."""
 
-    type: Literal["system"] = "system"
     subtype: Literal["hook_started"] = "hook_started"
     hook_id: str | None = None
     hook_name: str | None = None
@@ -196,12 +201,11 @@ class HookStartedSystemMessage(BaseMessage):
 
 
 @dataclass(kw_only=True)
-class StatusSystemMessage(BaseMessage):
+class StatusSystemMessage(BaseSystemMessage):
     """System status message."""
 
-    type: Literal["system"] = "system"
     subtype: Literal["status"] = "status"
-    status: Literal["compacting"] | str | None
+    status: Literal["compacting"] | None
 
 
 class TriggerMetadata(TypedDict):
@@ -210,10 +214,9 @@ class TriggerMetadata(TypedDict):
 
 
 @dataclass(kw_only=True)
-class CompactBoundarySystemMessage(BaseMessage):
-    """System message with metadata."""
+class CompactBoundarySystemMessage(BaseSystemMessage):
+    """System message emitted at compaction boundaries."""
 
-    type: Literal["system"] = "system"
     subtype: Literal["compact_boundary"] = "compact_boundary"
     compact_metadata: TriggerMetadata
 
@@ -237,10 +240,9 @@ class RateLimitMessage(BaseMessage):
 
 
 @dataclass(kw_only=True)
-class TaskStartedSystemMessage(BaseMessage):
+class TaskStartedSystemMessage(BaseSystemMessage):
     """System message emitted when a subagent task starts."""
 
-    type: Literal["system"] = "system"
     subtype: Literal["task_started"] = "task_started"
     task_id: str = ""
     tool_use_id: str | None = None
@@ -249,10 +251,9 @@ class TaskStartedSystemMessage(BaseMessage):
 
 
 @dataclass(kw_only=True)
-class TaskNotificationSystemMessage(BaseMessage):
+class TaskNotificationSystemMessage(BaseSystemMessage):
     """System message emitted when a subagent task completes, fails, or stops."""
 
-    type: Literal["system"] = "system"
     subtype: Literal["task_notification"] = "task_notification"
     task_id: str = ""
     status: Literal["completed", "failed", "stopped"] = "completed"
@@ -270,10 +271,9 @@ class TaskProgressUsage(TypedDict):
 
 
 @dataclass(kw_only=True)
-class TaskProgressSystemMessage(BaseMessage):
+class TaskProgressSystemMessage(BaseSystemMessage):
     """System message emitted periodically with task progress updates."""
 
-    type: Literal["system"] = "system"
     subtype: Literal["task_progress"] = "task_progress"
     task_id: str = ""
     tool_use_id: str | None = None
@@ -297,10 +297,9 @@ class FilePersistedFailure(TypedDict):
 
 
 @dataclass(kw_only=True)
-class FilesPersistedSystemMessage(BaseMessage):
+class FilesPersistedSystemMessage(BaseSystemMessage):
     """System message emitted when files have been persisted."""
 
-    type: Literal["system"] = "system"
     subtype: Literal["files_persisted"] = "files_persisted"
     files: list[FilePersistedEntry] | None = None
     failed: list[FilePersistedFailure] | None = None
@@ -310,10 +309,9 @@ class FilesPersistedSystemMessage(BaseMessage):
 
 
 @dataclass(kw_only=True)
-class HookProgressSystemMessage(BaseMessage):
+class HookProgressSystemMessage(BaseSystemMessage):
     """Progress update from a running hook."""
 
-    type: Literal["system"] = "system"
     subtype: Literal["hook_progress"] = "hook_progress"
     hook_id: str = ""
     hook_name: str = ""
@@ -324,10 +322,9 @@ class HookProgressSystemMessage(BaseMessage):
 
 
 @dataclass(kw_only=True)
-class HookResponseSystemMessage(BaseMessage):
-    """System message with metadata."""
+class HookResponseSystemMessage(BaseSystemMessage):
+    """System message emitted when a hook completes."""
 
-    type: Literal["system"] = "system"
     subtype: Literal["hook_response"] = "hook_response"
     hook_id: str
     hook_name: str
@@ -441,7 +438,7 @@ class AuthStatusMessage(BaseMessage):
 
 
 SystemMessageUnion = Annotated[
-    SystemMessage
+    InitSystemMessage
     | HookStartedSystemMessage
     | StatusSystemMessage
     | CompactBoundarySystemMessage
@@ -460,7 +457,7 @@ system_message_adapter: TypeAdapter[SystemMessageUnion] = TypeAdapter(SystemMess
 Message = (
     UserMessage
     | AssistantMessage
-    | SystemMessage
+    | InitSystemMessage
     | ResultMessage
     | StreamEvent
     | RateLimitMessage

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/src/clawd_code_sdk/models/options.py

@@ -30,49 +30,51 @@ logger = logging.getLogger(__name__)
 
 
 @dataclass(kw_only=True)
-class NewSession:
+class BaseSessionConfig:
+    """Common fields for all session configurations."""
+
+    persist: bool = True
+    """Whether to persist the session to disk."""
+
+
+@dataclass(kw_only=True)
+class NewSession(BaseSessionConfig):
     """Start a fresh session.
 
     Attributes:
         session_id: Deterministic session ID, or None to auto-generate a UUID.
-        persist: Whether to persist the session to disk.
     """
 
     mode: Literal["new"] = "new"
     session_id: str | None = None
-    persist: bool = True
 
 
 @dataclass(kw_only=True)
-class ResumeSession:
+class ResumeSession(BaseSessionConfig):
     """Resume an existing session by ID.
 
     Attributes:
         session_id: The session ID to resume.
         fork: If True, fork to a new session ID instead of continuing in-place.
         at_message: Resume from a specific message UUID within the session.
-        persist: Whether to persist the session to disk.
     """
 
     mode: Literal["resume"] = "resume"
     session_id: str
     fork: bool = False
     at_message: str | None = None
-    persist: bool = True
 
 
 @dataclass(kw_only=True)
-class ContinueLatest:
+class ContinueLatest(BaseSessionConfig):
     """Continue the most recent conversation.
 
     Attributes:
         fork: If True, fork to a new session ID instead of continuing in-place.
-        persist: Whether to persist the session to disk.
     """
 
     mode: Literal["continue"] = "continue"
     fork: bool = False
-    persist: bool = True
 
 
 SessionConfig = NewSession | ResumeSession | ContinueLatest
@@ -98,7 +100,7 @@ def resolve_session_config(value: str | SessionConfig | None) -> SessionConfig:
             return NewSession()
         case str() as session_id:
             return ResumeSession(session_id=session_id)
-        case NewSession() | ResumeSession() | ContinueLatest() as config:
+        case BaseSessionConfig() as config:
             return config
 
 

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/src/clawd_code_sdk/storage/replay.py

@@ -17,7 +17,7 @@ full content (since token-level deltas are not preserved in storage).
 
 Not reconstructible from storage:
     - Token-level streaming granularity (deltas are synthetic, one per block).
-    - SystemMessage(init): Session initialization metadata (tools, model, etc.).
+    - InitSystemMessage(init): Session initialization metadata (tools, model, etc.).
     - RateLimitMessage: Rate limit events are transient.
 
 Partially reconstructible (with ``include_result=True``):

clawd_code_sdk-0.2.2/tests/conftest.py

@@ -0,0 +1,35 @@
+"""Pytest configuration for tests."""
+
+import os
+from typing import Any
+
+import pytest
+
+
+_MSG_COUNTER = 0
+
+
+def make_beta_message(
+    content: list[dict[str, Any]],
+    model: str = "claude-opus-4-1-20250805",
+    **kwargs: Any,
+) -> dict[str, Any]:
+    """Create a wire-format message dict matching BetaMessage shape."""
+    global _MSG_COUNTER  # noqa: PLW0603
+    _MSG_COUNTER += 1
+    return {
+        "id": f"msg_test_{_MSG_COUNTER:04d}",
+        "type": "message",
+        "role": "assistant",
+        "content": content,
+        "model": model,
+        "stop_reason": "end_turn",
+        "stop_sequence": None,
+        "usage": {"input_tokens": 10, "output_tokens": 5},
+        **kwargs,
+    }
+
+
+@pytest.fixture(scope="session", autouse=True)
+def unset_anthropic_api_key():
+    os.environ["ANTHROPIC_API_KEY"] = ""

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/tests/test_client.py

@@ -9,6 +9,7 @@ from typing import TYPE_CHECKING, Literal
 from unittest.mock import AsyncMock
 
 import anyio
+from conftest import make_beta_message
 import pytest
 
 from clawd_code_sdk import (
@@ -130,11 +131,9 @@ class TestQueryFunction:
             test_messages = [
                 {
                     "type": "assistant",
-                    "message": {
-                        "role": "assistant",
-                        "content": [{"type": "text", "text": "4"}],
-                        "model": "claude-opus-4-1-20250805",
-                    },
+                    "message": make_beta_message(
+                        content=[{"type": "text", "text": "4"}],
+                    ),
                 },
                 _make_result(),
             ]
@@ -158,11 +157,9 @@ class TestQueryFunction:
             test_messages = [
                 {
                     "type": "assistant",
-                    "message": {
-                        "role": "assistant",
-                        "content": [{"type": "text", "text": "Hello!"}],
-                        "model": "claude-opus-4-1-20250805",
-                    },
+                    "message": make_beta_message(
+                        content=[{"type": "text", "text": "Hello!"}],
+                    ),
                 },
                 _make_result(),
             ]
@@ -193,11 +190,9 @@ class TestQueryFunction:
             test_messages = [
                 {
                     "type": "assistant",
-                    "message": {
-                        "role": "assistant",
-                        "content": [{"type": "text", "text": "Done"}],
-                        "model": "claude-opus-4-1-20250805",
-                    },
+                    "message": make_beta_message(
+                        content=[{"type": "text", "text": "Done"}],
+                    ),
                 },
                 _make_result(),
             ]
@@ -225,17 +220,16 @@ class TestAPIErrorRaising:
         async def _test():
             error_message = {
                 "type": "assistant",
-                "message": {
-                    "role": "assistant",
-                    "content": [
+                "message": make_beta_message(
+                    content=[
                         {
                             "type": "text",
                             "text": "API Error: The provided model identifier is invalid.",
                         }
                     ],
-                    "model": "claude-invalid-model",
-                    "error": "invalid_request",
-                },
+                    model="claude-invalid-model",
+                    error="invalid_request",
+                ),
             }
             mock_transport = create_mock_transport_with_messages([error_message])
 
@@ -255,17 +249,16 @@ class TestAPIErrorRaising:
         async def _test():
             error_message = {
                 "type": "assistant",
-                "message": {
-                    "role": "assistant",
-                    "content": [
+                "message": make_beta_message(
+                    content=[
                         {
                             "type": "text",
                             "text": "API Error: Rate limit exceeded",
                         }
                     ],
-                    "model": "claude-sonnet-4-5-20250514",
-                    "error": "rate_limit",
-                },
+                    model="claude-sonnet-4-5-20250514",
+                    error="rate_limit",
+                ),
             }
             mock_transport = create_mock_transport_with_messages([error_message])
 
@@ -283,12 +276,11 @@ class TestAPIErrorRaising:
         async def _test():
             error_message = {
                 "type": "assistant",
-                "message": {
-                    "role": "assistant",
-                    "content": [{"type": "text", "text": "API Error: Invalid API key"}],
-                    "model": "claude-sonnet-4-5-20250514",
-                    "error": "authentication_failed",
-                },
+                "message": make_beta_message(
+                    content=[{"type": "text", "text": "API Error: Invalid API key"}],
+                    model="claude-sonnet-4-5-20250514",
+                    error="authentication_failed",
+                ),
             }
             mock_transport = create_mock_transport_with_messages([error_message])
 
@@ -306,17 +298,16 @@ class TestAPIErrorRaising:
         async def _test():
             error_message = {
                 "type": "assistant",
-                "message": {
-                    "role": "assistant",
-                    "content": [
+                "message": make_beta_message(
+                    content=[
                         {
                             "type": "text",
                             "text": "API Error: Repeated 529 Overloaded errors",
                         }
                     ],
-                    "model": "claude-sonnet-4-5-20250514",
-                    "error": "server_error",
-                },
+                    model="claude-sonnet-4-5-20250514",
+                    error="server_error",
+                ),
             }
             mock_transport = create_mock_transport_with_messages([error_message])
 
@@ -334,12 +325,11 @@ class TestAPIErrorRaising:
         async def _test():
             error_message = {
                 "type": "assistant",
-                "message": {
-                    "role": "assistant",
-                    "content": [{"type": "text", "text": "Unknown error"}],
-                    "model": "claude-sonnet-4-5-20250514",
-                    "error": "unknown",
-                },
+                "message": make_beta_message(
+                    content=[{"type": "text", "text": "Unknown error"}],
+                    model="claude-sonnet-4-5-20250514",
+                    error="unknown",
+                ),
             }
             mock_transport = create_mock_transport_with_messages([error_message])
 
@@ -358,11 +348,10 @@ class TestAPIErrorRaising:
             test_messages = [
                 {
                     "type": "assistant",
-                    "message": {
-                        "role": "assistant",
-                        "content": [{"type": "text", "text": "Hello!"}],
-                        "model": "claude-sonnet-4-5-20250514",
-                    },
+                    "message": make_beta_message(
+                        content=[{"type": "text", "text": "Hello!"}],
+                        model="claude-sonnet-4-5-20250514",
+                    ),
                 },
                 _make_result(uuid="msg-002"),
             ]

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/tests/test_integration.py

@@ -8,6 +8,7 @@ import json
 from unittest.mock import AsyncMock, patch
 
 import anyio
+from conftest import make_beta_message
 import pytest
 
 from clawd_code_sdk import (
@@ -74,11 +75,9 @@ class TestIntegration:
             test_messages = [
                 {
                     "type": "assistant",
-                    "message": {
-                        "role": "assistant",
-                        "content": [{"type": "text", "text": "2 + 2 equals 4"}],
-                        "model": "claude-opus-4-1-20250805",
-                    },
+                    "message": make_beta_message(
+                        content=[{"type": "text", "text": "2 + 2 equals 4"}]
+                    ),
                 },
                 {
                     "type": "result",
@@ -121,9 +120,8 @@ class TestIntegration:
             test_messages = [
                 {
                     "type": "assistant",
-                    "message": {
-                        "role": "assistant",
-                        "content": [
+                    "message": make_beta_message(
+                        content=[
                             {"type": "text", "text": "Let me read that file for you."},
                             {
                                 "type": "tool_use",
@@ -131,9 +129,8 @@ class TestIntegration:
                                 "name": "Read",
                                 "input": {"file_path": "/test.txt"},
                             },
-                        ],
-                        "model": "claude-opus-4-1-20250805",
-                    },
+                        ]
+                    ),
                 },
                 {
                     "type": "result",
@@ -196,13 +193,9 @@ class TestIntegration:
             test_messages = [
                 {
                     "type": "assistant",
-                    "message": {
-                        "role": "assistant",
-                        "content": [
-                            {"type": "text", "text": "Continuing from previous conversation"}
-                        ],
-                        "model": "claude-opus-4-1-20250805",
-                    },
+                    "message": make_beta_message(
+                        content=[{"type": "text", "text": "Continuing from previous conversation"}]
+                    ),
                 },
                 {
                     "type": "result",
@@ -245,11 +238,9 @@ class TestIntegration:
             test_messages = [
                 {
                     "type": "assistant",
-                    "message": {
-                        "role": "assistant",
-                        "content": [{"type": "text", "text": "Starting to read..."}],
-                        "model": "claude-opus-4-1-20250805",
-                    },
+                    "message": make_beta_message(
+                        content=[{"type": "text", "text": "Starting to read..."}]
+                    ),
                 },
                 {
                     "type": "result",

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/tests/test_message_parser.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from conftest import make_beta_message
 import pytest
 
 from clawd_code_sdk._errors import MessageParseError
@@ -56,13 +57,12 @@ class TestContentBlockDispatch:
         """Thinking blocks parse with signature preserved."""
         data = {
             "type": "assistant",
-            "message": {
-                "content": [
+            "message": make_beta_message(
+                content=[
                     {"type": "thinking", "thinking": "hmm...", "signature": "sig-abc"},
                     {"type": "text", "text": "answer"},
                 ],
-                "model": "claude-opus-4-1-20250805",
-            },
+            ),
         }
         msg = parse_message(data)
         assert isinstance(msg, AssistantMessage)
@@ -100,10 +100,9 @@ class TestParentToolUseId:
     def test_assistant_message(self):
         data = {
             "type": "assistant",
-            "message": {
-                "content": [{"type": "text", "text": "hi"}],
-                "model": "claude-opus-4-1-20250805",
-            },
+            "message": make_beta_message(
+                content=[{"type": "text", "text": "hi"}],
+            ),
             "parent_tool_use_id": "toolu_xyz",
         }
         msg = parse_message(data)
@@ -116,11 +115,10 @@ class TestAssistantErrorExtraction:
     def test_error_from_message_level(self):
         data = {
             "type": "assistant",
-            "message": {
-                "content": [{"type": "text", "text": "API Error: bad key"}],
-                "model": "claude-opus-4-1-20250805",
-                "error": "authentication_failed",
-            },
+            "message": make_beta_message(
+                content=[{"type": "text", "text": "API Error: bad key"}],
+                error="authentication_failed",
+            ),
         }
         msg = parse_message(data)
         assert isinstance(msg, AssistantMessage) and msg.error == "authentication_failed"
@@ -129,10 +127,9 @@ class TestAssistantErrorExtraction:
         data = {
             "type": "assistant",
             "error": "rate_limit",
-            "message": {
-                "content": [{"type": "text", "text": "Rate limited"}],
-                "model": "claude-opus-4-1-20250805",
-            },
+            "message": make_beta_message(
+                content=[{"type": "text", "text": "Rate limited"}],
+            ),
         }
         msg = parse_message(data)
         assert isinstance(msg, AssistantMessage) and msg.error == "rate_limit"
@@ -140,10 +137,9 @@ class TestAssistantErrorExtraction:
     def test_no_error(self):
         data = {
             "type": "assistant",
-            "message": {
-                "content": [{"type": "text", "text": "ok"}],
-                "model": "claude-opus-4-1-20250805",
-            },
+            "message": make_beta_message(
+                content=[{"type": "text", "text": "ok"}],
+            ),
         }
         msg = parse_message(data)
         assert isinstance(msg, AssistantMessage) and msg.error is None

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/tests/test_session.py

@@ -8,6 +8,7 @@ import json
 from unittest.mock import AsyncMock
 
 import anyio
+from conftest import make_beta_message
 import pytest
 
 from clawd_code_sdk import (
@@ -73,18 +74,15 @@ def _create_mock_transport_with_messages(messages: list[dict]) -> AsyncMock:
 
 ASSISTANT_MSG = {
     "type": "assistant",
-    "message": {
-        "role": "assistant",
-        "content": [{"type": "text", "text": "Hello, world!"}],
-        "model": "claude-sonnet-4-5-20250514",
-    },
+    "message": make_beta_message(
+        content=[{"type": "text", "text": "Hello, world!"}], model="claude-sonnet-4-5-20250514"
+    ),
 }
 
 TOOL_USE_MSG = {
     "type": "assistant",
-    "message": {
-        "role": "assistant",
-        "content": [
+    "message": make_beta_message(
+        content=[
             {"type": "text", "text": "Let me read that."},
             {
                 "type": "tool_use",
@@ -93,8 +91,8 @@ TOOL_USE_MSG = {
                 "input": {"path": "/tmp/test.py"},
             },
         ],
-        "model": "claude-sonnet-4-5-20250514",
-    },
+        model="claude-sonnet-4-5-20250514",
+    ),
 }
 
 RESULT_MSG = asdict(

{clawd_code_sdk-0.2.1 → clawd_code_sdk-0.2.2}/tests/test_streaming_client.py

@@ -11,6 +11,7 @@ from typing import TYPE_CHECKING
 from unittest.mock import AsyncMock, patch
 
 import anyio
+from conftest import make_beta_message
 import pytest
 
 from clawd_code_sdk import (
@@ -324,11 +325,7 @@ class TestClaudeSDKClientStreaming:
                     # Then yield the actual messages
                     yield {
                         "type": "assistant",
-                        "message": {
-                            "role": "assistant",
-                            "content": [{"type": "text", "text": "Hello!"}],
-                            "model": "claude-opus-4-1-20250805",
-                        },
+                        "message": make_beta_message(content=[{"type": "text", "text": "Hello!"}]),
                     }
                     yield {
                         "type": "user",
@@ -394,11 +391,7 @@ class TestClaudeSDKClientStreaming:
                     # Then yield the actual messages
                     yield {
                         "type": "assistant",
-                        "message": {
-                            "role": "assistant",
-                            "content": [{"type": "text", "text": "Answer"}],
-                            "model": "claude-opus-4-1-20250805",
-                        },
+                        "message": make_beta_message(content=[{"type": "text", "text": "Answer"}]),
                     }
                     yield {
                         "type": "result",
@@ -420,11 +413,9 @@ class TestClaudeSDKClientStreaming:
                     # This should not be yielded
                     yield {
                         "type": "assistant",
-                        "message": {
-                            "role": "assistant",
-                            "content": [{"type": "text", "text": "Should not see this"}],
-                        },
-                        "model": "claude-opus-4-1-20250805",
+                        "message": make_beta_message(
+                            content=[{"type": "text", "text": "Should not see this"}]
+                        ),
                     }
 
                 mock_transport.read_messages = mock_receive
@@ -549,11 +540,9 @@ class TestClaudeSDKClientStreaming:
                     await asyncio.sleep(0.1)
                     yield {
                         "type": "assistant",
-                        "message": {
-                            "role": "assistant",
-                            "content": [{"type": "text", "text": "Response 1"}],
-                            "model": "claude-opus-4-1-20250805",
-                        },
+                        "message": make_beta_message(
+                            content=[{"type": "text", "text": "Response 1"}]
+                        ),
                     }
                     await asyncio.sleep(0.1)
                     yield {
@@ -811,19 +800,11 @@ class TestClaudeSDKClientEdgeCases:
                     # Then yield the actual messages
                     yield {
                         "type": "assistant",
-                        "message": {
-                            "role": "assistant",
-                            "content": [{"type": "text", "text": "Hello"}],
-                            "model": "claude-opus-4-1-20250805",
-                        },
+                        "message": make_beta_message(content=[{"type": "text", "text": "Hello"}]),
                     }
                     yield {
                         "type": "assistant",
-                        "message": {
-                            "role": "assistant",
-                            "content": [{"type": "text", "text": "World"}],
-                            "model": "claude-opus-4-1-20250805",
-                        },
+                        "message": make_beta_message(content=[{"type": "text", "text": "World"}]),
                     }
                     yield {
                         "type": "result",
@@ -911,11 +892,9 @@ class TestAsyncGeneratorCleanup:
                     for i in range(5):
                         yield {
                             "type": "assistant",
-                            "message": {
-                                "role": "assistant",
-                                "content": [{"type": "text", "text": f"Message {i}"}],
-                                "model": "claude-opus-4-1-20250805",
-                            },
+                            "message": make_beta_message(
+                                content=[{"type": "text", "text": f"Message {i}"}]
+                            ),
                         }
 
                 mock_transport.read_messages = mock_receive

clawd_code_sdk-0.2.1/tests/conftest.py

@@ -1,10 +0,0 @@
-"""Pytest configuration for tests."""
-
-import os
-
-import pytest
-
-
-@pytest.fixture(scope="session", autouse=True)
-def unset_anthropic_api_key():
-    os.environ["ANTHROPIC_API_KEY"] = ""