clawd-code-sdk 0.5.0__tar.gz → 0.5.2__tar.gz

{clawd_code_sdk-0.5.0 → clawd_code_sdk-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clawd-code-sdk
-Version: 0.5.0
+Version: 0.5.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

{clawd_code_sdk-0.5.0 → clawd_code_sdk-0.5.2}/pyproject.toml

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

{clawd_code_sdk-0.5.0 → clawd_code_sdk-0.5.2}/src/clawd_code_sdk/_internal/message_parser.py

@@ -10,20 +10,18 @@ from pydantic import TypeAdapter
 from clawd_code_sdk._errors import MessageParseError
 from clawd_code_sdk.models import (
     AssistantMessage,
+    AuthStatusMessage,
+    PromptSuggestionMessage,
+    RateLimitMessage,
     ResultErrorMessage,
     ResultSuccessMessage,
     StreamEvent,
+    ToolProgressMessage,
+    ToolUseSummaryMessage,
     UserMessage,
     content_block_adapter,
     system_message_adapter,
 )
-from clawd_code_sdk.models.messages import (
-    AuthStatusMessage,
-    PromptSuggestionMessage,
-    RateLimitMessage,
-    ToolProgressMessage,
-    ToolUseSummaryMessage,
-)
 
 
 if TYPE_CHECKING:

{clawd_code_sdk-0.5.0 → clawd_code_sdk-0.5.2}/src/clawd_code_sdk/_internal/query.py

@@ -13,8 +13,15 @@ import anyio
 
 from clawd_code_sdk._errors import ControlRequestError, ControlRequestTimeoutError
 from clawd_code_sdk.models import (
+    ClaudeCodeServerInfo,
+    ControlErrorResponse,
     ControlResponse,
+    ElicitationRequest,
+    JSONRPCError,
+    JSONRPCErrorResponse,
+    JSONRPCResultResponse,
     PermissionResultAllow,
+    SDKControlElicitationRequest,
     SDKControlInitializeRequest,
     SDKControlInterruptRequest,
     SDKControlMcpMessageRequest,
@@ -27,10 +34,6 @@ from clawd_code_sdk.models import (
     ToolPermissionContext,
     control_request_adapter,
 )
-from clawd_code_sdk.models.control import ControlErrorResponse, SDKControlElicitationRequest
-from clawd_code_sdk.models.mcp import JSONRPCError, JSONRPCErrorResponse, JSONRPCResultResponse
-from clawd_code_sdk.models.permissions import ElicitationRequest
-from clawd_code_sdk.models.server_info import ClaudeCodeServerInfo
 
 
 if TYPE_CHECKING:
@@ -41,18 +44,23 @@ if TYPE_CHECKING:
     from mcp.types import ContentBlock
 
     from clawd_code_sdk._internal.transport import Transport
-    from clawd_code_sdk.models import ControlRequestUnion, PermissionMode
-    from clawd_code_sdk.models.agents import AgentDefinition
-    from clawd_code_sdk.models.hooks import HookCallback, HookEvent, HookMatcher
-    from clawd_code_sdk.models.input_types import AskUserQuestionInput
-    from clawd_code_sdk.models.mcp import JSONRPCMessage, JSONRPCResponse, RequestId
-    from clawd_code_sdk.models.permissions import (
+    from clawd_code_sdk.models import (
+        AgentDefinition,
+        AskUserQuestionInput,
         CanUseTool,
+        ClaudeCodeAgentInfo,
+        ControlRequestUnion,
+        HookCallback,
+        HookEvent,
+        HookMatcher,
+        JSONRPCMessage,
+        JSONRPCResponse,
         OnElicitation,
         OnUserQuestion,
+        PermissionMode,
         PermissionResult,
+        RequestId,
     )
-    from clawd_code_sdk.models.server_info import ClaudeCodeAgentInfo
 
 logger = logging.getLogger(__name__)
 

{clawd_code_sdk-0.5.0 → clawd_code_sdk-0.5.2}/src/clawd_code_sdk/_internal/transport/subprocess_cli.py

@@ -26,7 +26,7 @@ from clawd_code_sdk._errors import (
 )
 from clawd_code_sdk._internal.transport import Transport
 from clawd_code_sdk._version import __version__
-from clawd_code_sdk.models.base import (
+from clawd_code_sdk.models.thinking import (
     ThinkingConfigAdaptive,
     ThinkingConfigDisabled,
     ThinkingConfigEnabled,
@@ -118,7 +118,7 @@ class SubprocessCLITransport(Transport):
             cmd.extend(["--permission-mode", self._options.permission_mode])
 
         # Session configuration
-        from clawd_code_sdk.models.options import (
+        from clawd_code_sdk.models import (
             ContinueLatest,
             FromPR,
             NewSession,
@@ -195,10 +195,10 @@ class SubprocessCLITransport(Transport):
 
         # Add plugin directories
         for plugin in self._options.plugins:
-            if plugin["type"] == "local":
-                cmd.extend(["--plugin-dir", plugin["path"]])
+            if plugin.type == "local":
+                cmd.extend(["--plugin-dir", plugin.path])
             else:
-                raise ValueError(f"Unsupported plugin type: {plugin['type']}")
+                raise ValueError(f"Unsupported plugin type: {plugin.type}")
 
         # Add extra args for future CLI flags
         for flag, value in self._options.extra_args.items():
@@ -349,14 +349,18 @@ class SubprocessCLITransport(Transport):
                 await self._stderr_stream.aclose()
             self._stderr_stream = None
 
-        # Terminate and wait for process
+        # Wait for process to exit gracefully after stdin EOF,
+        # giving the CLI time to flush the session transcript.
+        # Only resort to SIGTERM if it doesn't exit in time.
         if self._process.returncode is None:
-            with suppress(ProcessLookupError):
-                self._process.terminate()
-                # Wait for process to finish with timeout
-                with suppress(Exception):
-                    # Just try to wait, but don't block if it fails
+            try:
+                with anyio.fail_after(10):
                     await self._process.wait()
+            except TimeoutError:
+                with suppress(ProcessLookupError):
+                    self._process.terminate()
+                    with suppress(Exception):
+                        await self._process.wait()
 
         self._process = None
         self._stdout_stream = None

{clawd_code_sdk-0.5.0 → clawd_code_sdk-0.5.2}/src/clawd_code_sdk/anthropic_types.py

@@ -9,13 +9,13 @@ from __future__ import annotations
 
 from typing import Annotated
 
-from anthropic.types import TextBlock, WebSearchResultBlock, WebSearchToolResultError
 from anthropic.types.beta import (
     BetaBashCodeExecutionResultBlock,
     BetaBashCodeExecutionToolResultError,
     BetaCodeExecutionResultBlock,
     BetaCodeExecutionToolResultError,
     BetaImageBlockParam,
+    BetaTextBlock,
     BetaTextEditorCodeExecutionCreateResultBlock,
     BetaTextEditorCodeExecutionStrReplaceResultBlock,
     BetaTextEditorCodeExecutionToolResultError,
@@ -25,6 +25,8 @@ from anthropic.types.beta import (
     BetaToolSearchToolSearchResultBlock,
     BetaWebFetchBlock,
     BetaWebFetchToolResultErrorBlock,
+    BetaWebSearchResultBlock,
+    BetaWebSearchToolResultError,
 )
 from pydantic import BaseModel, Field, TypeAdapter
 
@@ -52,13 +54,13 @@ from pydantic import BaseModel, Field, TypeAdapter
 # - "text_editor_code_execution_str_replace_result" -> BetaTextEditorCodeExecutionStrReplaceResultBlock  # noqa: E501
 # - "text_editor_code_execution_tool_result_error" -> BetaTextEditorCodeExecutionToolResultError
 ToolResultContentBlock = Annotated[
-    TextBlock
+    BetaTextBlock
     | BetaImageBlockParam
     | BetaToolReferenceBlock
     | BetaToolSearchToolSearchResultBlock
     | BetaToolSearchToolResultError
-    | WebSearchResultBlock
-    | WebSearchToolResultError
+    | BetaWebSearchResultBlock
+    | BetaWebSearchToolResultError
     | BetaWebFetchBlock
     | BetaWebFetchToolResultErrorBlock
     | BetaCodeExecutionResultBlock
@@ -79,9 +81,9 @@ def _get_adapter() -> TypeAdapter[list[ToolResultContentBlock]]:
     if _tool_result_content_adapter is None:
         # Force schema build for Anthropic models (deferred by default)
         for model in [
-            TextBlock,
-            WebSearchResultBlock,
-            WebSearchToolResultError,
+            BetaTextBlock,
+            BetaWebSearchResultBlock,
+            BetaWebSearchToolResultError,
             BetaBashCodeExecutionResultBlock,
             BetaBashCodeExecutionToolResultError,
             BetaCodeExecutionResultBlock,

{clawd_code_sdk-0.5.0 → clawd_code_sdk-0.5.2}/src/clawd_code_sdk/client.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from dataclasses import replace
 import os
-from typing import TYPE_CHECKING, Any, Self
+from typing import TYPE_CHECKING, Any, Literal, Self
 
 import anyenv
 from pydantic import TypeAdapter
@@ -12,17 +12,16 @@ from pydantic import TypeAdapter
 from clawd_code_sdk._errors import CLIConnectionError
 from clawd_code_sdk.models import (
     AccumulatedUsage,
-    ClaudeAgentOptions,
-    ResultMessage,
-)
-from clawd_code_sdk.models.mcp import McpStatusResponse
-from clawd_code_sdk.models.messages import (
     AssistantMessage,
+    ClaudeAgentOptions,
+    ClaudeCodeAgentInfo,  # noqa: TC001
+    McpStatusResponse,
     ResultErrorMessage,
+    ResultMessage,
     ResultSuccessMessage,
+    StatusSystemMessage,
     UserTextPrompt,
 )
-from clawd_code_sdk.models.server_info import ClaudeCodeAgentInfo  # noqa: TC001
 
 
 if TYPE_CHECKING:
@@ -30,10 +29,13 @@ if TYPE_CHECKING:
 
     from clawd_code_sdk import Transport
     from clawd_code_sdk._internal.query import Query
-    from clawd_code_sdk.models import Message, PermissionMode
-    from clawd_code_sdk.models.mcp import McpServerConfig
-    from clawd_code_sdk.models.messages import UserPrompt
-    from clawd_code_sdk.models.server_info import ClaudeCodeServerInfo
+    from clawd_code_sdk.models import (
+        ClaudeCodeServerInfo,
+        McpServerConfig,
+        Message,
+        PermissionMode,
+        UserPrompt,
+    )
 
 
 class ClaudeSDKClient:
@@ -69,6 +71,8 @@ class ClaudeSDKClient:
         """Cumulative token usage across all queries in this session."""
         self.query_usage: AccumulatedUsage = AccumulatedUsage()
         """Token usage for the current/last query only (reset on each query() call)."""
+        self.status: Literal["compacting"] | None = None
+        """Current client status, or None when idle."""
 
     def _ensure_connected(self) -> Query:
         """Return the active Query, raising if not connected."""
@@ -156,6 +160,8 @@ class ClaudeSDKClient:
             match message:
                 case AssistantMessage():
                     message.raise_if_api_error()
+                case StatusSystemMessage(status=status):
+                    self.status = status
                 case ResultSuccessMessage() | ResultErrorMessage():
                     self.query_usage.accumulate(message.usage)
                     self.session_usage.accumulate(message.usage)

{clawd_code_sdk-0.5.0 → clawd_code_sdk-0.5.2}/src/clawd_code_sdk/list_sessions.py

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING
 
 import anyenv
 
-from clawd_code_sdk.models.messages import SDKSessionInfo
+from clawd_code_sdk.models import SDKSessionInfo
 from clawd_code_sdk.storage.helpers import (
     decode_project_path,
     get_claude_projects_dir,

{clawd_code_sdk-0.5.0 → clawd_code_sdk-0.5.2}/src/clawd_code_sdk/models/__init__.py

@@ -15,7 +15,7 @@ Types are organized into submodules:
 
 from __future__ import annotations
 
-from .agents import AgentDefinition, AgentInfo, SystemPromptPreset, ToolsPreset
+from .agents import AgentDefinition, AgentInfo, ToolsPreset
 from .base import (
     ApiKeySource,
     ElicitationAction,
@@ -26,6 +26,9 @@ from .base import (
     SdkBeta,
     SettingSource,
     StopReason,
+    FastModeState,
+)
+from .thinking import (
     ThinkingConfig,
     ThinkingConfigAdaptive,
     ThinkingConfigDisabled,
@@ -144,6 +147,7 @@ from .mcp import (
     McpToolStatus,
     RequestId,
     SdkPluginConfig,
+    ExternalMcpServerConfig,
 )
 from .output_types import (
     TOOL_USE_RESULT_TYPES,
@@ -222,21 +226,8 @@ from .messages import (
     AccumulatedUsage,
     AssistantMessage,
     AssistantMessageError,
-    BaseSystemMessage,
-    CompactBoundarySystemMessage,
-    ElicitationCompleteMessage,
-    FastModeState,
-    HookResponseSystemMessage,
-    HookStartedSystemMessage,
-    InitSystemMessage,
-    LocalCommandOutputMessage,
-    McpServerStatus,
-    Message,
     ModelUsage,
     BaseResultMessage,
-    PromptRequest,
-    PromptRequestOption,
-    PromptResponse,
     PromptSuggestionMessage,
     RateLimitInfo,
     RateLimitMessage,
@@ -245,34 +236,29 @@ from .messages import (
     ResultSuccessMessage,
     SDKPermissionDenial,
     SDKSessionInfo,
-    StatusSystemMessage,
     StreamEvent,
     AuthStatusMessage,
-    FilesPersistedSystemMessage,
-    HookProgressSystemMessage,
-    TaskNotificationSystemMessage,
-    TaskProgressSystemMessage,
-    TaskProgressUsage,
-    TaskStartedSystemMessage,
     ToolProgressMessage,
     ToolUseSummaryMessage,
-    TriggerMetadata,
     Usage,
+    MiscMessages,
     UserMessage,
+)
+from .prompts import (
     DocumentMediaType,
     ImageMediaType,
-    PlainTextMediaType,
     UserDocumentPrompt,
+    PlainTextMediaType,
     UserDocumentURLPrompt,
     UserImagePrompt,
     UserImageURLPrompt,
     UserPlainTextDocumentPrompt,
     UserPrompt,
     UserTextPrompt,
-    system_message_adapter,
 )
-from .options import ClaudeAgentOptions
+from .prompt_requests import PromptRequest, PromptRequestOption, PromptResponse
 from .options import (
+    ClaudeAgentOptions,
     BaseSessionConfig,
     ContinueLatest,
     FromPR,
@@ -297,9 +283,31 @@ from .permissions import (
     ToolPermissionContext,
 )
 from .sandbox import SandboxIgnoreViolations, SandboxNetworkConfig, SandboxSettings
+from .server_info import ClaudeCodeAgentInfo, ClaudeCodeServerInfo
+from .system_messages import (
+    system_message_adapter,
+    TriggerMetadata,
+    TaskProgressUsage,
+    StatusSystemMessage,
+    BaseSystemMessage,
+    CompactBoundarySystemMessage,
+    HookResponseSystemMessage,
+    McpServerStatus,
+    HookStartedSystemMessage,
+    InitSystemMessage,
+    FilesPersistedSystemMessage,
+    HookProgressSystemMessage,
+    TaskNotificationSystemMessage,
+    TaskProgressSystemMessage,
+    TaskStartedSystemMessage,
+    SystemMessageUnion,
+    LocalCommandOutputMessage,
+    ElicitationCompleteMessage,
+)
+
+Message = MiscMessages | SystemMessageUnion
 
 __all__ = [
-    # mcp
     "JSONRPC_VERSION",
     "TOOL_INPUT_TYPES",
     "TOOL_USE_RESULT_TYPES",
@@ -338,6 +346,8 @@ __all__ = [
     "BashToolUseResult",
     "CanUseTool",
     "ClaudeAgentOptions",
+    "ClaudeCodeAgentInfo",
+    "ClaudeCodeServerInfo",
     "CommandHookHandler",
     "CompactBoundarySystemMessage",
     "ConfigOutput",
@@ -363,6 +373,7 @@ __all__ = [
     "EnterWorktreeOutput",
     "ExitPlanModeInput",
     "ExitPlanModeOutput",
+    "ExternalMcpServerConfig",
     "FastModeState",
     "FileEditInput",
     "FileReadInput",
@@ -415,6 +426,7 @@ __all__ = [
     "McpStdioServerConfig",
     "McpToolStatus",
     "Message",
+    "MiscMessages",
     "ModelUsage",
     "NewSession",
     "NotebookEditInput",
@@ -509,7 +521,7 @@ __all__ = [
     "SubscribeMcpResourceOutput",
     "SubscribePollingOutput",
     "SyncHookJSONOutput",
-    "SystemPromptPreset",
+    "SystemMessageUnion",
     "TaskCompletedHookInput",
     "TaskInfo",
     "TaskNotificationSystemMessage",

{clawd_code_sdk-0.5.0 → clawd_code_sdk-0.5.2}/src/clawd_code_sdk/models/agents.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, fields
-from typing import Any, Literal, NotRequired, TypedDict
+from typing import Any, Literal, TypedDict
 
 from anthropic.types import Model  # noqa: TC002
 
@@ -41,14 +41,6 @@ class AgentInfo:
     """Model alias this agent uses. If omitted, inherits the parent's model."""
 
 
-class SystemPromptPreset(TypedDict):
-    """System prompt preset configuration."""
-
-    type: Literal["preset"]
-    preset: Literal["claude_code"]
-    append: NotRequired[str]
-
-
 class ToolsPreset(TypedDict):
     """Tools preset configuration."""
 

{clawd_code_sdk-0.5.0 → clawd_code_sdk-0.5.2}/src/clawd_code_sdk/models/base.py

@@ -25,6 +25,7 @@ TaskStatus = Literal["completed", "failed", "stopped"]
 CompactionTrigger = Literal["auto", "manual"]
 ElicitationMode = Literal["form", "url"]
 ElicitationAction = Literal["accept", "decline", "cancel"]
+FastModeState = Literal["off", "cooldown", "on"]
 
 StopReason = Literal[
     "end_turn",
@@ -69,26 +70,3 @@ class ClaudeCodeBaseModel(BaseModel):
         alias_generator=to_camel,
         extra="forbid" if IS_DEV else "ignore",
     )
-
-
-# Thinking configuration types
-class ThinkingConfigAdaptive(ClaudeCodeBaseModel):
-    """Adaptive thinking configuration - model decides thinking budget."""
-
-    type: Literal["adaptive"] = "adaptive"
-
-
-class ThinkingConfigEnabled(ClaudeCodeBaseModel):
-    """Enabled thinking configuration with explicit token budget."""
-
-    type: Literal["enabled"] = "enabled"
-    budget_tokens: int
-
-
-class ThinkingConfigDisabled(ClaudeCodeBaseModel):
-    """Disabled thinking configuration."""
-
-    type: Literal["disabled"] = "disabled"
-
-
-ThinkingConfig = ThinkingConfigAdaptive | ThinkingConfigEnabled | ThinkingConfigDisabled

{clawd_code_sdk-0.5.0 → clawd_code_sdk-0.5.2}/src/clawd_code_sdk/models/content_blocks.py

@@ -51,7 +51,7 @@ class ToolResultBlock:
 
     type: Literal["tool_result"] = field(default="tool_result", repr=False)
     tool_use_id: str = ""
-    content: str | list[dict[str, Any]] | None = None
+    content: str | list[dict[str, Any]] | None = None  # BetaContentBlock
     is_error: bool | None = None
 
     def get_parsed_content(self) -> list[ToolResultContentBlock] | str | None:

{clawd_code_sdk-0.5.0 → clawd_code_sdk-0.5.2}/src/clawd_code_sdk/models/mcp.py

@@ -109,13 +109,13 @@ McpServerConfig = (
 )
 
 
-class SdkPluginConfig(TypedDict):
+class SdkPluginConfig(ClaudeCodeBaseModel):
     """SDK plugin configuration.
 
     Currently only local plugins are supported via the 'local' type.
     """
 
-    type: Literal["local"]
+    type: Literal["local"] = "local"
     path: str