clawd-code-sdk 1.0.27__tar.gz → 1.0.28__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/PKG-INFO +1 -1
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/pyproject.toml +1 -1
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/_internal/query.py +21 -41
- clawd_code_sdk-1.0.28/src/clawd_code_sdk/anthropic_stream.py +205 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/__init__.py +24 -2
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/context_usage.py +1 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/control.py +58 -11
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/hooks.py +2 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/options.py +3 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/output_types.py +22 -1
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/permissions.py +19 -1
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/server_info.py +4 -1
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/settings.py +13 -1
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/mock_claude_server.py +11 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/test_session.py +25 -9
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/test_streaming_client.py +14 -5
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/test_tool_callbacks.py +4 -1
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/.gitignore +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/LICENSE +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/README.md +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/__init__.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/_bundled/.gitignore +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/_errors.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/_internal/__init__.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/_internal/transport/__init__.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/_internal/transport/subprocess_cli.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/_internal/transport/subprocess_utils.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/_version.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/client.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/instrumentation.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/list_sessions.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/mcp_utils.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/agents.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/anthropic_types.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/base.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/content_blocks.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/input_types.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/mcp.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/messages.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/prompt_requests.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/prompts.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/session.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/system_messages.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/thinking.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/usage.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/py.typed +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/session.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/storage/ARCHITECTURE.md +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/storage/__init__.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/storage/helpers.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/storage/models.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/storage/replay.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/usage.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/__init__.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/conftest.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/__init__.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_agents_and_settings.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_dynamic_control.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_hook_events.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_hooks.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_include_partial_messages.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_mcp_resources.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_mcp_tools.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_sdk_mcp_resources.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_sdk_mcp_tools.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_slash_commands.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_stderr_callback.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_storage_parsing.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_structured_output.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_subagent_invocation.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/e2e/test_tool_permissions.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/mcp_server.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/test_changelog.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/test_client.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/test_errors.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/test_image.png +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/test_integration.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/test_message_parser.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/test_sdk_mcp_integration.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/test_subprocess_buffering.py +0 -0
- {clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/tests/test_transport.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: clawd-code-sdk
|
|
3
|
-
Version: 1.0.
|
|
3
|
+
Version: 1.0.28
|
|
4
4
|
Summary: Python SDK for Claude Code
|
|
5
5
|
Project-URL: Documentation, https://github.com/phil65/claude-agent-sdk-python
|
|
6
6
|
Project-URL: Homepage, https://github.com/phil65/claude-agent-sdk-python
|
|
@@ -8,7 +8,7 @@ from dataclasses import replace
|
|
|
8
8
|
import logging
|
|
9
9
|
import math
|
|
10
10
|
import os
|
|
11
|
-
from typing import TYPE_CHECKING, Any, Self, cast
|
|
11
|
+
from typing import TYPE_CHECKING, Any, Self, assert_never, cast
|
|
12
12
|
|
|
13
13
|
import anyenv
|
|
14
14
|
import anyio
|
|
@@ -28,17 +28,13 @@ from clawd_code_sdk.models import (
|
|
|
28
28
|
PermissionResultAllow,
|
|
29
29
|
SDKControlElicitationRequest,
|
|
30
30
|
SDKControlInitializeRequest,
|
|
31
|
-
SDKControlInterruptRequest,
|
|
32
31
|
SDKControlMcpMessageRequest,
|
|
33
32
|
SDKControlPermissionRequest,
|
|
34
33
|
SDKControlResponse,
|
|
35
|
-
SDKControlRewindFilesRequest,
|
|
36
|
-
SDKControlSetPermissionModeRequest,
|
|
37
|
-
SDKControlStopTaskRequest,
|
|
38
34
|
SDKHookCallbackRequest,
|
|
39
35
|
SideQuestionResponse,
|
|
40
36
|
ToolPermissionContext,
|
|
41
|
-
|
|
37
|
+
incoming_control_request_adapter,
|
|
42
38
|
)
|
|
43
39
|
|
|
44
40
|
|
|
@@ -53,10 +49,10 @@ if TYPE_CHECKING:
|
|
|
53
49
|
CanUseTool,
|
|
54
50
|
ClaudeAgentOptions,
|
|
55
51
|
ClaudeCodeAgentInfo,
|
|
56
|
-
ControlRequestUnion,
|
|
57
52
|
HookCallback,
|
|
58
53
|
HookEvent,
|
|
59
54
|
HookMatcher,
|
|
55
|
+
IncomingControlRequest,
|
|
60
56
|
JSONRPCMessage,
|
|
61
57
|
JSONRPCResponse,
|
|
62
58
|
OnElicitation,
|
|
@@ -98,6 +94,7 @@ class Query:
|
|
|
98
94
|
agents: dict[str, AgentDefinition] | None = None,
|
|
99
95
|
system_prompt: str | None = None,
|
|
100
96
|
append_system_prompt: str | None = None,
|
|
97
|
+
exclude_dynamic_sections: bool | None = None,
|
|
101
98
|
json_schema: dict[str, Any] | None = None,
|
|
102
99
|
prompt_suggestions: bool | None = None,
|
|
103
100
|
agent_progress_summaries: bool | None = None,
|
|
@@ -115,6 +112,7 @@ class Query:
|
|
|
115
112
|
agents: Optional agent definitions to send via initialize
|
|
116
113
|
system_prompt: Optional system prompt to send via initialize
|
|
117
114
|
append_system_prompt: Optional text to append to preset system prompt
|
|
115
|
+
exclude_dynamic_sections: Exclude dynamic sections from the system prompt
|
|
118
116
|
json_schema: Optional JSON schema for structured output
|
|
119
117
|
prompt_suggestions: Optional flag to enable prompt suggestions
|
|
120
118
|
agent_progress_summaries: Optional flag to enable agent progress summaries
|
|
@@ -132,6 +130,7 @@ class Query:
|
|
|
132
130
|
self._agents = agents
|
|
133
131
|
self._system_prompt = system_prompt
|
|
134
132
|
self._append_system_prompt = append_system_prompt
|
|
133
|
+
self._exclude_dynamic_sections = exclude_dynamic_sections
|
|
135
134
|
self._json_schema = json_schema
|
|
136
135
|
self._prompt_suggestions = prompt_suggestions
|
|
137
136
|
self._agent_progress_summaries = agent_progress_summaries
|
|
@@ -205,6 +204,7 @@ class Query:
|
|
|
205
204
|
agents=options.agents,
|
|
206
205
|
system_prompt=system_prompt,
|
|
207
206
|
append_system_prompt=append_system_prompt,
|
|
207
|
+
exclude_dynamic_sections=options.exclude_dynamic_sections,
|
|
208
208
|
json_schema=options.get_json_schema(),
|
|
209
209
|
prompt_suggestions=options.prompt_suggestions,
|
|
210
210
|
agent_progress_summaries=options.agent_progress_summaries,
|
|
@@ -244,6 +244,7 @@ class Query:
|
|
|
244
244
|
append_system_prompt=self._append_system_prompt,
|
|
245
245
|
json_schema=self._json_schema,
|
|
246
246
|
prompt_suggestions=self._prompt_suggestions,
|
|
247
|
+
exclude_dynamic_sections=self._exclude_dynamic_sections,
|
|
247
248
|
sdk_mcp_servers=list(self.sdk_mcp_servers.keys()) or None,
|
|
248
249
|
agent_progress_summaries=self._agent_progress_summaries,
|
|
249
250
|
).model_dump(by_alias=True, exclude_none=True)
|
|
@@ -305,16 +306,15 @@ class Query:
|
|
|
305
306
|
logger.info("unhandled control message: %s", msg)
|
|
306
307
|
case {"type": "control_request"}:
|
|
307
308
|
req_id = message["request_id"]
|
|
308
|
-
req =
|
|
309
|
+
req = incoming_control_request_adapter.validate_python(message["request"])
|
|
309
310
|
self._spawn_control_request_handler(
|
|
310
311
|
req_id, self._handle_control_request(req_id, req)
|
|
311
312
|
)
|
|
312
313
|
case {"type": "control_cancel_request"}:
|
|
313
|
-
cancel_id
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
inflight.cancel()
|
|
314
|
+
if (cancel_id := message.get("request_id")) and (
|
|
315
|
+
inflight := self._inflight_requests.pop(cancel_id, None)
|
|
316
|
+
):
|
|
317
|
+
inflight.cancel()
|
|
318
318
|
case {"type": "result"}:
|
|
319
319
|
self._first_result_event.set()
|
|
320
320
|
await self._message_send.send(message)
|
|
@@ -342,7 +342,7 @@ class Query:
|
|
|
342
342
|
async def _handle_control_request(
|
|
343
343
|
self,
|
|
344
344
|
request_id: str,
|
|
345
|
-
request_data:
|
|
345
|
+
request_data: IncomingControlRequest,
|
|
346
346
|
) -> None:
|
|
347
347
|
"""Handle incoming control request from CLI."""
|
|
348
348
|
response_data: dict[str, Any] = {}
|
|
@@ -358,14 +358,8 @@ class Query:
|
|
|
358
358
|
response_data = {"mcp_response": mcp_resp}
|
|
359
359
|
case SDKControlElicitationRequest() as req:
|
|
360
360
|
response_data = await self._handle_elicitation_request(req)
|
|
361
|
-
case
|
|
362
|
-
|
|
363
|
-
| SDKControlSetPermissionModeRequest()
|
|
364
|
-
| SDKControlRewindFilesRequest()
|
|
365
|
-
| SDKControlStopTaskRequest()
|
|
366
|
-
| SDKControlInterruptRequest() # No response data needed
|
|
367
|
-
):
|
|
368
|
-
pass # Handled elsewhere
|
|
361
|
+
case _ as unreachable:
|
|
362
|
+
assert_never(unreachable)
|
|
369
363
|
dct = ControlResponse(subtype="success", request_id=request_id, response=response_data)
|
|
370
364
|
success_response = SDKControlResponse(type="control_response", response=dct)
|
|
371
365
|
await self.write_json(success_response)
|
|
@@ -387,29 +381,15 @@ class Query:
|
|
|
387
381
|
Dispatches AskUserQuestion to on_user_question if set,
|
|
388
382
|
otherwise falls through to can_use_tool for backwards compatibility.
|
|
389
383
|
"""
|
|
390
|
-
context = ToolPermissionContext(
|
|
391
|
-
tool_use_id=req.tool_use_id,
|
|
392
|
-
agent_id=req.agent_id,
|
|
393
|
-
decision_reason=req.decision_reason,
|
|
394
|
-
suggestions=req.permission_suggestions or [],
|
|
395
|
-
blocked_path=req.blocked_path,
|
|
396
|
-
title=req.title,
|
|
397
|
-
display_name=req.display_name,
|
|
398
|
-
description=req.description,
|
|
399
|
-
)
|
|
400
|
-
|
|
384
|
+
context = ToolPermissionContext.from_permission_request(req)
|
|
401
385
|
# Dispatch elicitation requests to dedicated callback if available
|
|
402
386
|
if req.tool_name == "AskUserQuestion" and self.on_user_question:
|
|
403
387
|
input_data = cast(AskUserQuestionInput, req.input)
|
|
404
388
|
result = await self.on_user_question(input_data, context)
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
if not self.can_use_tool:
|
|
410
|
-
raise RuntimeError("canUseTool callback is not provided")
|
|
411
|
-
|
|
412
|
-
result = await self.can_use_tool(req.tool_name, req.input, context)
|
|
389
|
+
else:
|
|
390
|
+
if not self.can_use_tool:
|
|
391
|
+
raise RuntimeError("canUseTool callback is not provided")
|
|
392
|
+
result = await self.can_use_tool(req.tool_name, req.input, context)
|
|
413
393
|
if isinstance(result, PermissionResultAllow) and result.updated_input is None:
|
|
414
394
|
result.updated_input = req.input
|
|
415
395
|
return result
|
|
@@ -0,0 +1,205 @@
|
|
|
1
|
+
"""Adapter that translates Claude Code event streams to Anthropic raw stream events.
|
|
2
|
+
|
|
3
|
+
Converts the multi-turn ``receive_response()`` message stream into a sequence
|
|
4
|
+
of ``BetaRawMessageStreamEvent`` objects, identical to what the Anthropic SDK
|
|
5
|
+
emits during streaming.
|
|
6
|
+
|
|
7
|
+
Live ``StreamEvent`` messages are passed through directly. ``AssistantMessage``
|
|
8
|
+
messages that arrive *without* preceding stream events (non-streaming mode,
|
|
9
|
+
replays, reconnection) are synthesized into the full event sequence
|
|
10
|
+
(message_start → content_block_start → delta → stop → message_delta → message_stop).
|
|
11
|
+
"""
|
|
12
|
+
|
|
13
|
+
from __future__ import annotations
|
|
14
|
+
|
|
15
|
+
import json
|
|
16
|
+
from typing import TYPE_CHECKING, assert_never
|
|
17
|
+
|
|
18
|
+
from anthropic.types.beta import (
|
|
19
|
+
BetaMessage,
|
|
20
|
+
BetaRawContentBlockStartEvent,
|
|
21
|
+
BetaRawContentBlockStopEvent,
|
|
22
|
+
BetaRawMessageDeltaEvent,
|
|
23
|
+
BetaRawMessageStartEvent,
|
|
24
|
+
BetaRawMessageStopEvent,
|
|
25
|
+
BetaTextBlock as ATextBlock,
|
|
26
|
+
BetaTextDelta,
|
|
27
|
+
BetaThinkingBlock as AThinkingBlock,
|
|
28
|
+
BetaThinkingDelta,
|
|
29
|
+
BetaToolUseBlock as AToolUseBlock,
|
|
30
|
+
BetaUsage,
|
|
31
|
+
)
|
|
32
|
+
from anthropic.types.beta.beta_raw_content_block_delta_event import (
|
|
33
|
+
BetaRawContentBlockDeltaEvent,
|
|
34
|
+
)
|
|
35
|
+
from anthropic.types.beta.beta_raw_message_delta_event import Delta as BetaRawMessageDelta
|
|
36
|
+
|
|
37
|
+
from clawd_code_sdk.models import (
|
|
38
|
+
AssistantMessage,
|
|
39
|
+
StreamEvent,
|
|
40
|
+
)
|
|
41
|
+
from clawd_code_sdk.models.content_blocks import (
|
|
42
|
+
TextBlock,
|
|
43
|
+
ThinkingBlock,
|
|
44
|
+
ToolUseBlock,
|
|
45
|
+
)
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
if TYPE_CHECKING:
|
|
49
|
+
from collections.abc import AsyncIterator
|
|
50
|
+
|
|
51
|
+
from anthropic.types.beta import (
|
|
52
|
+
BetaInputJSONDelta as BetaInputJSONDeltaType,
|
|
53
|
+
BetaRawMessageStreamEvent,
|
|
54
|
+
)
|
|
55
|
+
|
|
56
|
+
from clawd_code_sdk.models import Message
|
|
57
|
+
|
|
58
|
+
|
|
59
|
+
async def to_anthropic_events(
|
|
60
|
+
messages: AsyncIterator[Message],
|
|
61
|
+
) -> AsyncIterator[BetaRawMessageStreamEvent]:
|
|
62
|
+
"""Convert a Claude Code message stream to Anthropic raw stream events.
|
|
63
|
+
|
|
64
|
+
Handles two cases:
|
|
65
|
+
|
|
66
|
+
1. **Live streaming** — ``StreamEvent`` messages whose ``.event`` is already
|
|
67
|
+
a ``BetaRawMessageStreamEvent``. These are yielded as-is.
|
|
68
|
+
|
|
69
|
+
2. **Completed messages** — ``AssistantMessage`` that arrive without
|
|
70
|
+
preceding ``StreamEvent`` (non-streaming, reconnection, replays).
|
|
71
|
+
These are decomposed into the full synthetic event sequence.
|
|
72
|
+
|
|
73
|
+
All other message types (``UserMessage``, ``ResultMessage``,
|
|
74
|
+
``ToolProgressMessage``, system messages, etc.) are silently skipped.
|
|
75
|
+
|
|
76
|
+
Args:
|
|
77
|
+
messages: Async iterator of Claude Code messages, typically from
|
|
78
|
+
``client.receive_response()`` or ``client.receive_messages()``.
|
|
79
|
+
|
|
80
|
+
Yields:
|
|
81
|
+
``BetaRawMessageStreamEvent`` in the same order and structure
|
|
82
|
+
as a native Anthropic streaming response.
|
|
83
|
+
"""
|
|
84
|
+
saw_stream_events = False
|
|
85
|
+
|
|
86
|
+
async for msg in messages:
|
|
87
|
+
if isinstance(msg, StreamEvent):
|
|
88
|
+
saw_stream_events = True
|
|
89
|
+
yield msg.event
|
|
90
|
+
|
|
91
|
+
elif isinstance(msg, AssistantMessage):
|
|
92
|
+
if saw_stream_events:
|
|
93
|
+
# Stream events already covered this message — the
|
|
94
|
+
# AssistantMessage is the completed snapshot. Skip it
|
|
95
|
+
# so we don't duplicate content.
|
|
96
|
+
#
|
|
97
|
+
# Reset for the next LLM call in the agentic loop.
|
|
98
|
+
saw_stream_events = False
|
|
99
|
+
continue
|
|
100
|
+
|
|
101
|
+
# No stream events preceded this message — synthesize the
|
|
102
|
+
# full event sequence from the completed content blocks.
|
|
103
|
+
for event in _synthesize_events(msg):
|
|
104
|
+
yield event
|
|
105
|
+
saw_stream_events = False
|
|
106
|
+
|
|
107
|
+
|
|
108
|
+
def _synthesize_events(
|
|
109
|
+
msg: AssistantMessage,
|
|
110
|
+
) -> list[BetaRawMessageStreamEvent]:
|
|
111
|
+
"""Synthesize a complete Anthropic event sequence from a completed message."""
|
|
112
|
+
events: list[BetaRawMessageStreamEvent] = []
|
|
113
|
+
am = msg.message
|
|
114
|
+
|
|
115
|
+
# message_start
|
|
116
|
+
beta_msg = BetaMessage(
|
|
117
|
+
id=am.id,
|
|
118
|
+
type="message",
|
|
119
|
+
role="assistant",
|
|
120
|
+
content=[],
|
|
121
|
+
model=am.model,
|
|
122
|
+
stop_reason=None,
|
|
123
|
+
stop_sequence=None,
|
|
124
|
+
usage=BetaUsage(input_tokens=0, output_tokens=0),
|
|
125
|
+
)
|
|
126
|
+
events.append(BetaRawMessageStartEvent(type="message_start", message=beta_msg))
|
|
127
|
+
|
|
128
|
+
# content blocks
|
|
129
|
+
for index, block in enumerate(am.content):
|
|
130
|
+
# content_block_start
|
|
131
|
+
start_block = _to_anthropic_block(block)
|
|
132
|
+
if start_block is None:
|
|
133
|
+
continue
|
|
134
|
+
events.append(
|
|
135
|
+
BetaRawContentBlockStartEvent(
|
|
136
|
+
type="content_block_start",
|
|
137
|
+
index=index,
|
|
138
|
+
content_block=start_block,
|
|
139
|
+
)
|
|
140
|
+
)
|
|
141
|
+
|
|
142
|
+
# content_block_delta
|
|
143
|
+
delta = _to_anthropic_delta(block)
|
|
144
|
+
if delta is not None:
|
|
145
|
+
events.append(
|
|
146
|
+
BetaRawContentBlockDeltaEvent(
|
|
147
|
+
type="content_block_delta",
|
|
148
|
+
index=index,
|
|
149
|
+
delta=delta,
|
|
150
|
+
)
|
|
151
|
+
)
|
|
152
|
+
|
|
153
|
+
# content_block_stop
|
|
154
|
+
events.append(BetaRawContentBlockStopEvent(type="content_block_stop", index=index))
|
|
155
|
+
|
|
156
|
+
# message_delta
|
|
157
|
+
from anthropic.types.beta import BetaMessageDeltaUsage
|
|
158
|
+
|
|
159
|
+
events.append(
|
|
160
|
+
BetaRawMessageDeltaEvent(
|
|
161
|
+
type="message_delta",
|
|
162
|
+
delta=BetaRawMessageDelta(stop_reason=am.stop_reason),
|
|
163
|
+
usage=BetaMessageDeltaUsage(output_tokens=0),
|
|
164
|
+
)
|
|
165
|
+
)
|
|
166
|
+
|
|
167
|
+
# message_stop
|
|
168
|
+
events.append(BetaRawMessageStopEvent(type="message_stop"))
|
|
169
|
+
|
|
170
|
+
return events
|
|
171
|
+
|
|
172
|
+
|
|
173
|
+
def _to_anthropic_block(
|
|
174
|
+
block: TextBlock | ThinkingBlock | ToolUseBlock,
|
|
175
|
+
) -> ATextBlock | AThinkingBlock | AToolUseBlock | None:
|
|
176
|
+
"""Convert a content block to its Anthropic start-event form (empty content)."""
|
|
177
|
+
match block:
|
|
178
|
+
case TextBlock():
|
|
179
|
+
return ATextBlock(type="text", text="")
|
|
180
|
+
case ThinkingBlock():
|
|
181
|
+
return AThinkingBlock(type="thinking", thinking="", signature="")
|
|
182
|
+
case ToolUseBlock():
|
|
183
|
+
return AToolUseBlock(type="tool_use", id=block.id, name=block.name, input={})
|
|
184
|
+
case _ as unreachable:
|
|
185
|
+
assert_never(unreachable)
|
|
186
|
+
|
|
187
|
+
|
|
188
|
+
def _to_anthropic_delta(
|
|
189
|
+
block: TextBlock | ThinkingBlock | ToolUseBlock,
|
|
190
|
+
) -> BetaTextDelta | BetaThinkingDelta | BetaInputJSONDeltaType | None:
|
|
191
|
+
"""Convert a content block's content into a single delta event."""
|
|
192
|
+
from anthropic.types.beta import BetaInputJSONDelta
|
|
193
|
+
|
|
194
|
+
match block:
|
|
195
|
+
case TextBlock(text=text) if text:
|
|
196
|
+
return BetaTextDelta(type="text_delta", text=text)
|
|
197
|
+
case ThinkingBlock(thinking=thinking) if thinking:
|
|
198
|
+
return BetaThinkingDelta(type="thinking_delta", thinking=thinking)
|
|
199
|
+
case ToolUseBlock(input=input_) if input_:
|
|
200
|
+
return BetaInputJSONDelta(
|
|
201
|
+
type="input_json_delta",
|
|
202
|
+
partial_json=json.dumps(input_),
|
|
203
|
+
)
|
|
204
|
+
case _:
|
|
205
|
+
return None
|
|
@@ -48,7 +48,18 @@ from .context_usage import (
|
|
|
48
48
|
from .control import (
|
|
49
49
|
ControlErrorResponse,
|
|
50
50
|
ControlRequestUnion,
|
|
51
|
+
IncomingControlRequest,
|
|
52
|
+
OutgoingControlRequest,
|
|
51
53
|
ControlResponse,
|
|
54
|
+
SDKControlApplyFlagSettingsRequest,
|
|
55
|
+
SDKControlMcpAuthenticateRequest,
|
|
56
|
+
SDKControlMcpClearAuthRequest,
|
|
57
|
+
SDKControlMcpReconnectRequest,
|
|
58
|
+
SDKControlMcpSetServersRequest,
|
|
59
|
+
SDKControlMcpStatusRequest,
|
|
60
|
+
SDKControlMcpToggleRequest,
|
|
61
|
+
SDKControlSetMaxThinkingTokensRequest,
|
|
62
|
+
SDKControlSetModelRequest,
|
|
52
63
|
SDKControlCancelAsyncMessageRequest,
|
|
53
64
|
SDKControlChannelEnableRequest,
|
|
54
65
|
ClaudeOAuthWaitForCompletionResponse,
|
|
@@ -78,7 +89,7 @@ from .control import (
|
|
|
78
89
|
SDKControlGetSettingsRequest,
|
|
79
90
|
SDKControlStopTaskRequest,
|
|
80
91
|
SDKHookCallbackRequest,
|
|
81
|
-
|
|
92
|
+
incoming_control_request_adapter,
|
|
82
93
|
)
|
|
83
94
|
from .hooks import (
|
|
84
95
|
AgentHookHandler,
|
|
@@ -531,6 +542,7 @@ __all__ = [
|
|
|
531
542
|
"ImageBlock",
|
|
532
543
|
"ImageMediaType",
|
|
533
544
|
"ImageSource",
|
|
545
|
+
"IncomingControlRequest",
|
|
534
546
|
"InitSystemMessage",
|
|
535
547
|
"InstructionsLoadedHookInput",
|
|
536
548
|
"JSONRPCError",
|
|
@@ -578,6 +590,7 @@ __all__ = [
|
|
|
578
590
|
"NotificationHookSpecificOutput",
|
|
579
591
|
"OnElicitation",
|
|
580
592
|
"OnUserQuestion",
|
|
593
|
+
"OutgoingControlRequest",
|
|
581
594
|
"PermissionBehavior",
|
|
582
595
|
"PermissionDecisionClassification",
|
|
583
596
|
"PermissionDeniedHookInput",
|
|
@@ -630,6 +643,7 @@ __all__ = [
|
|
|
630
643
|
"ResultMessage",
|
|
631
644
|
"ResultSuccessMessage",
|
|
632
645
|
"ResumeSession",
|
|
646
|
+
"SDKControlApplyFlagSettingsRequest",
|
|
633
647
|
"SDKControlCancelAsyncMessageRequest",
|
|
634
648
|
"SDKControlChannelEnableRequest",
|
|
635
649
|
"SDKControlClaudeOAuthWaitForCompletionRequest",
|
|
@@ -640,14 +654,22 @@ __all__ = [
|
|
|
640
654
|
"SDKControlGetSettingsRequest",
|
|
641
655
|
"SDKControlInitializeRequest",
|
|
642
656
|
"SDKControlInterruptRequest",
|
|
657
|
+
"SDKControlMcpAuthenticateRequest",
|
|
658
|
+
"SDKControlMcpClearAuthRequest",
|
|
643
659
|
"SDKControlMcpMessageRequest",
|
|
644
660
|
"SDKControlMcpOAuthCallbackUrlRequest",
|
|
661
|
+
"SDKControlMcpReconnectRequest",
|
|
662
|
+
"SDKControlMcpSetServersRequest",
|
|
663
|
+
"SDKControlMcpStatusRequest",
|
|
664
|
+
"SDKControlMcpToggleRequest",
|
|
645
665
|
"SDKControlPermissionRequest",
|
|
646
666
|
"SDKControlRemoteControlRequest",
|
|
647
667
|
"SDKControlRequest",
|
|
648
668
|
"SDKControlResponse",
|
|
649
669
|
"SDKControlRewindFilesRequest",
|
|
650
670
|
"SDKControlSeedReadStateRequest",
|
|
671
|
+
"SDKControlSetMaxThinkingTokensRequest",
|
|
672
|
+
"SDKControlSetModelRequest",
|
|
651
673
|
"SDKControlSetPermissionModeRequest",
|
|
652
674
|
"SDKControlSetProactiveRequest",
|
|
653
675
|
"SDKControlSideQuestionRequest",
|
|
@@ -739,7 +761,7 @@ __all__ = [
|
|
|
739
761
|
"WorktreeCreateHookSpecificOutput",
|
|
740
762
|
"WorktreeRemoveHookInput",
|
|
741
763
|
"WriteOutput",
|
|
742
|
-
"
|
|
764
|
+
"incoming_control_request_adapter",
|
|
743
765
|
"message_adapter",
|
|
744
766
|
"system_message_adapter",
|
|
745
767
|
]
|
|
@@ -121,6 +121,7 @@ class ContextUsageMessageBreakdown(ClaudeCodeBaseModel):
|
|
|
121
121
|
attachment_tokens: int
|
|
122
122
|
assistant_message_tokens: int
|
|
123
123
|
user_message_tokens: int
|
|
124
|
+
redirected_context_tokens: int
|
|
124
125
|
tool_calls_by_type: list[ContextUsageToolCallBreakdown]
|
|
125
126
|
attachments_by_type: list[ContextUsageAttachmentBreakdown]
|
|
126
127
|
|
|
@@ -66,6 +66,17 @@ class SDKControlInitializeRequest(_ControlBase):
|
|
|
66
66
|
sdk_mcp_servers: list[str] | None = Field(default=None, serialization_alias="sdkMcpServers")
|
|
67
67
|
system_prompt: str | None = Field(default=None, serialization_alias="systemPrompt")
|
|
68
68
|
append_system_prompt: str | None = Field(default=None, serialization_alias="appendSystemPrompt")
|
|
69
|
+
exclude_dynamic_sections: bool | None = Field(
|
|
70
|
+
default=None,
|
|
71
|
+
serialization_alias="excludeDynamicSections",
|
|
72
|
+
)
|
|
73
|
+
"""When true, omit per-user dynamic sections from the cached system prompt.
|
|
74
|
+
|
|
75
|
+
Omits info like working directory, auto-memory path and re-inject them as the first usermessage.
|
|
76
|
+
Lets cross-user prompt caching hit on a static system prompt prefix.
|
|
77
|
+
Tradeoff: the model sees this context slightly later in the prompt,
|
|
78
|
+
so steering on the working directory and memory location is marginally less authoritative.
|
|
79
|
+
Has no effect when a custom (non-preset) system prompt is in use."""
|
|
69
80
|
json_schema: dict[str, Any] | None = Field(default=None, serialization_alias="jsonSchema")
|
|
70
81
|
prompt_suggestions: bool | None = Field(default=None, serialization_alias="promptSuggestions")
|
|
71
82
|
agent_progress_summaries: bool | None = Field(
|
|
@@ -350,11 +361,28 @@ class SDKControlElicitationRequest(_ControlBase):
|
|
|
350
361
|
"""Elicitation ID for correlating URL elicitations with completion notifications."""
|
|
351
362
|
requested_schema: dict[str, Any] | None = None
|
|
352
363
|
"""JSON Schema for the requested input (only for 'form' mode)."""
|
|
364
|
+
title: str | None = None
|
|
365
|
+
"""Permission-display title from the MCP server's _meta['anthropic/permissionDisplay'].
|
|
366
|
+
|
|
367
|
+
Mirrors can_use_tool.title so SDK consumers can render elicitation-driven permission prompts
|
|
368
|
+
with structured headers instead of parsing `message`.
|
|
369
|
+
"""
|
|
370
|
+
display_name: str | None = None
|
|
371
|
+
"""Short tool/server label from `_meta['anthropic/permissionDisplay'].displayName`."""
|
|
372
|
+
description: str | None = None
|
|
373
|
+
"""Permission-display description from `_meta['anthropic/permissionDisplay'].description`."""
|
|
353
374
|
|
|
354
375
|
def to_mcp(self) -> mcp.types.ElicitRequestParams:
|
|
355
376
|
"""Convert to the corresponding MCP elicitation request params."""
|
|
356
377
|
from mcp.types import ElicitRequestFormParams, ElicitRequestURLParams
|
|
357
378
|
|
|
379
|
+
meta = {
|
|
380
|
+
"anthropic/permissionDisplay": {
|
|
381
|
+
"title": self.title,
|
|
382
|
+
"displayName": self.display_name,
|
|
383
|
+
"description": self.description,
|
|
384
|
+
}
|
|
385
|
+
}
|
|
358
386
|
match self.mode:
|
|
359
387
|
case "url":
|
|
360
388
|
assert self.url is not None
|
|
@@ -363,12 +391,14 @@ class SDKControlElicitationRequest(_ControlBase):
|
|
|
363
391
|
message=self.message,
|
|
364
392
|
url=self.url,
|
|
365
393
|
elicitationId=self.elicitation_id,
|
|
394
|
+
_meta=ElicitRequestURLParams.Meta.model_validate(meta), # ty:ignore[unknown-argument]
|
|
366
395
|
)
|
|
367
396
|
case "form":
|
|
368
397
|
assert self.requested_schema is not None
|
|
369
398
|
return ElicitRequestFormParams(
|
|
370
399
|
message=self.message,
|
|
371
400
|
requestedSchema=self.requested_schema,
|
|
401
|
+
_meta=ElicitRequestFormParams.Meta.model_validate(meta), # ty:ignore[unknown-argument]
|
|
372
402
|
)
|
|
373
403
|
case None:
|
|
374
404
|
raise ValueError("mode must be 'url' or 'form'")
|
|
@@ -385,20 +415,28 @@ class SDKControlElicitationRequest(_ControlBase):
|
|
|
385
415
|
from mcp.types import ElicitRequestFormParams, ElicitRequestURLParams
|
|
386
416
|
|
|
387
417
|
match params:
|
|
388
|
-
case ElicitRequestURLParams(url=url, message=message, elicitationId=id_):
|
|
418
|
+
case ElicitRequestURLParams(url=url, message=message, elicitationId=id_, meta=meta):
|
|
419
|
+
meta_dct = meta.model_dump().get("anthropic/permissionDisplay", {}) if meta else {}
|
|
389
420
|
return cls(
|
|
390
421
|
mcp_server_name=mcp_server_name,
|
|
391
422
|
message=message,
|
|
392
423
|
mode="url",
|
|
393
424
|
url=url,
|
|
394
425
|
elicitation_id=id_,
|
|
426
|
+
title=meta_dct.get("title"),
|
|
427
|
+
display_name=meta_dct.get("displayName"),
|
|
428
|
+
description=meta_dct.get("description"),
|
|
395
429
|
)
|
|
396
|
-
case ElicitRequestFormParams(message=message, requestedSchema=schema):
|
|
430
|
+
case ElicitRequestFormParams(message=message, requestedSchema=schema, meta=meta):
|
|
431
|
+
meta_dct = meta.model_dump().get("anthropic/permissionDisplay", {}) if meta else {}
|
|
397
432
|
return cls(
|
|
398
433
|
mcp_server_name=mcp_server_name,
|
|
399
434
|
message=message,
|
|
400
435
|
mode="form",
|
|
401
436
|
requested_schema=dict(schema),
|
|
437
|
+
title=meta_dct.get("title"),
|
|
438
|
+
display_name=meta_dct.get("displayName"),
|
|
439
|
+
description=meta_dct.get("description"),
|
|
402
440
|
)
|
|
403
441
|
case _ as unreachable:
|
|
404
442
|
assert_never(unreachable)
|
|
@@ -446,19 +484,21 @@ class SDKControlSideQuestionRequest(_ControlBase):
|
|
|
446
484
|
question: str
|
|
447
485
|
|
|
448
486
|
|
|
449
|
-
|
|
487
|
+
IncomingControlRequest = Annotated[
|
|
488
|
+
SDKControlPermissionRequest
|
|
489
|
+
| SDKHookCallbackRequest
|
|
490
|
+
| SDKControlMcpMessageRequest
|
|
491
|
+
| SDKControlElicitationRequest,
|
|
492
|
+
Discriminator("subtype"),
|
|
493
|
+
]
|
|
494
|
+
|
|
495
|
+
OutgoingControlRequest = Annotated[
|
|
450
496
|
SDKControlInterruptRequest
|
|
451
|
-
| SDKControlPermissionRequest
|
|
452
497
|
| SDKControlInitializeRequest
|
|
453
498
|
| SDKControlSetPermissionModeRequest
|
|
454
499
|
| SDKControlSetModelRequest
|
|
455
500
|
| SDKControlSetMaxThinkingTokensRequest
|
|
456
501
|
| SDKControlMcpStatusRequest
|
|
457
|
-
| SDKHookCallbackRequest
|
|
458
|
-
| SDKControlMcpMessageRequest
|
|
459
|
-
| SDKControlRewindFilesRequest
|
|
460
|
-
| SDKControlCancelAsyncMessageRequest
|
|
461
|
-
| SDKControlSeedReadStateRequest
|
|
462
502
|
| SDKControlMcpSetServersRequest
|
|
463
503
|
| SDKControlReloadPluginsRequest
|
|
464
504
|
| SDKControlMcpReconnectRequest
|
|
@@ -476,11 +516,18 @@ ControlRequestUnion = Annotated[
|
|
|
476
516
|
| SDKControlApplyFlagSettingsRequest
|
|
477
517
|
| SDKControlGetContextUsageRequest
|
|
478
518
|
| SDKControlGetSettingsRequest
|
|
479
|
-
|
|
|
519
|
+
| SDKControlRewindFilesRequest
|
|
520
|
+
| SDKControlCancelAsyncMessageRequest
|
|
521
|
+
| SDKControlSeedReadStateRequest,
|
|
522
|
+
Discriminator("subtype"),
|
|
523
|
+
]
|
|
524
|
+
|
|
525
|
+
ControlRequestUnion = Annotated[
|
|
526
|
+
IncomingControlRequest | OutgoingControlRequest,
|
|
480
527
|
Discriminator("subtype"),
|
|
481
528
|
]
|
|
482
529
|
|
|
483
|
-
|
|
530
|
+
incoming_control_request_adapter = TypeAdapter[IncomingControlRequest](IncomingControlRequest)
|
|
484
531
|
|
|
485
532
|
|
|
486
533
|
class SDKControlRequest(_ControlBase):
|
|
@@ -192,6 +192,7 @@ class UserPromptSubmitHookInput(BaseHookInput):
|
|
|
192
192
|
|
|
193
193
|
hook_event_name: Literal["UserPromptSubmit"]
|
|
194
194
|
prompt: str
|
|
195
|
+
session_title: NotRequired[str]
|
|
195
196
|
|
|
196
197
|
|
|
197
198
|
class StopHookInput(BaseHookInput):
|
|
@@ -465,6 +466,7 @@ class UserPromptSubmitHookSpecificOutput(TypedDict):
|
|
|
465
466
|
|
|
466
467
|
hookEventName: Literal["UserPromptSubmit"]
|
|
467
468
|
additionalContext: NotRequired[str]
|
|
469
|
+
sessionTitle: NotRequired[str]
|
|
468
470
|
|
|
469
471
|
|
|
470
472
|
class SessionStartHookSpecificOutput(TypedDict):
|
|
@@ -268,6 +268,9 @@ class ClaudeAgentOptions:
|
|
|
268
268
|
When True (default) and system_prompt is set, it is appended to the
|
|
269
269
|
builtin system prompt. When False, the system_prompt replaces it entirely.
|
|
270
270
|
"""
|
|
271
|
+
exclude_dynamic_sections: bool | None = None
|
|
272
|
+
"""Whether to exclude dynamic sections from the system prompt."""
|
|
273
|
+
|
|
271
274
|
hooks: dict[HookEvent, list[HookMatcher]] | None = None
|
|
272
275
|
"""Hook configurations."""
|
|
273
276
|
agents: dict[str, AgentDefinition] | None = None
|
|
@@ -84,6 +84,25 @@ class AgentOutputUsage(TypedDict):
|
|
|
84
84
|
"""Cache creation statistics."""
|
|
85
85
|
|
|
86
86
|
|
|
87
|
+
class ToolStats(TypedDict):
|
|
88
|
+
"""Tool usage statistics from an agent task."""
|
|
89
|
+
|
|
90
|
+
readCount: int
|
|
91
|
+
"""Number of read tool calls."""
|
|
92
|
+
searchCount: int
|
|
93
|
+
"""Number of search tool calls."""
|
|
94
|
+
bashCount: int
|
|
95
|
+
"""Number of bash tool calls."""
|
|
96
|
+
editFileCount: int
|
|
97
|
+
"""Number of edit file tool calls."""
|
|
98
|
+
linesAdded: int
|
|
99
|
+
"""Number of lines added by edit file tool calls."""
|
|
100
|
+
linesRemoved: int
|
|
101
|
+
"""Number of lines removed by edit file tool calls."""
|
|
102
|
+
otherToolCount: int
|
|
103
|
+
"""Number of other tool calls."""
|
|
104
|
+
|
|
105
|
+
|
|
87
106
|
class AgentCompletedOutput(TypedDict):
|
|
88
107
|
"""Output from the Task tool when the agent completed successfully."""
|
|
89
108
|
|
|
@@ -103,6 +122,8 @@ class AgentCompletedOutput(TypedDict):
|
|
|
103
122
|
"""Total tokens used."""
|
|
104
123
|
usage: AgentOutputUsage
|
|
105
124
|
"""Detailed token usage statistics."""
|
|
125
|
+
toolStats: NotRequired[ToolStats]
|
|
126
|
+
"""Tool usage statistics."""
|
|
106
127
|
prompt: str
|
|
107
128
|
"""The prompt that was given to the agent."""
|
|
108
129
|
|
|
@@ -448,7 +469,7 @@ class EditOutput(TypedDict):
|
|
|
448
469
|
filePath: str
|
|
449
470
|
oldString: str
|
|
450
471
|
newString: str
|
|
451
|
-
originalFile: str
|
|
472
|
+
originalFile: str | None
|
|
452
473
|
structuredPatch: list[StructuredPatchHunk]
|
|
453
474
|
userModified: bool
|
|
454
475
|
replaceAll: bool
|
|
@@ -4,7 +4,7 @@ from __future__ import annotations
|
|
|
4
4
|
|
|
5
5
|
from collections.abc import Awaitable, Callable
|
|
6
6
|
from dataclasses import dataclass, field
|
|
7
|
-
from typing import Any, Literal
|
|
7
|
+
from typing import TYPE_CHECKING, Any, Literal, Self
|
|
8
8
|
|
|
9
9
|
from clawd_code_sdk.models.base import (
|
|
10
10
|
ClaudeCodeBaseModel,
|
|
@@ -15,6 +15,10 @@ from clawd_code_sdk.models.base import (
|
|
|
15
15
|
from clawd_code_sdk.models.input_types import AskUserQuestionInput, ToolInput
|
|
16
16
|
|
|
17
17
|
|
|
18
|
+
if TYPE_CHECKING:
|
|
19
|
+
from clawd_code_sdk.models import SDKControlPermissionRequest
|
|
20
|
+
|
|
21
|
+
|
|
18
22
|
# Permission Update types (matching TypeScript SDK)
|
|
19
23
|
PermissionUpdateDestination = Literal[
|
|
20
24
|
"userSettings",
|
|
@@ -114,6 +118,20 @@ class ToolPermissionContext:
|
|
|
114
118
|
E.g. "Claude will have read and write access to files in ~/Downloads".
|
|
115
119
|
"""
|
|
116
120
|
|
|
121
|
+
@classmethod
|
|
122
|
+
def from_permission_request(cls, req: SDKControlPermissionRequest) -> Self:
|
|
123
|
+
"""Create a PermissionContext from a permission request."""
|
|
124
|
+
return cls(
|
|
125
|
+
tool_use_id=req.tool_use_id,
|
|
126
|
+
agent_id=req.agent_id,
|
|
127
|
+
decision_reason=req.decision_reason,
|
|
128
|
+
suggestions=req.permission_suggestions or [],
|
|
129
|
+
blocked_path=req.blocked_path,
|
|
130
|
+
title=req.title,
|
|
131
|
+
display_name=req.display_name,
|
|
132
|
+
description=req.description,
|
|
133
|
+
)
|
|
134
|
+
|
|
117
135
|
|
|
118
136
|
# Match TypeScript's PermissionResult structure
|
|
119
137
|
class PermissionResultAllow(ClaudeCodeBaseModel):
|
|
@@ -10,6 +10,9 @@ from pydantic import Field
|
|
|
10
10
|
from clawd_code_sdk.models.base import ClaudeCodeBaseModel, EffortLevel, FastModeState
|
|
11
11
|
|
|
12
12
|
|
|
13
|
+
ApiProvider = Literal["firstParty", "bedrock", "vertex", "foundry", "anthropicAws", "mantle"]
|
|
14
|
+
|
|
15
|
+
|
|
13
16
|
class ClaudeCodeModelInfo(ClaudeCodeBaseModel):
|
|
14
17
|
"""Information about an available AI model from Claude Code."""
|
|
15
18
|
|
|
@@ -69,7 +72,7 @@ class ClaudeCodeAccountInfo(ClaudeCodeBaseModel):
|
|
|
69
72
|
organization: str | None = None
|
|
70
73
|
"""Organization name."""
|
|
71
74
|
|
|
72
|
-
api_provider:
|
|
75
|
+
api_provider: ApiProvider | None = None
|
|
73
76
|
"""Active API backend.
|
|
74
77
|
|
|
75
78
|
Anthropic OAuth login only applies when "firstParty"; for 3P providers
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# generated by datamodel-codegen:
|
|
2
2
|
# filename: claude-code-settings-titled.json
|
|
3
|
-
# timestamp: 2026-04-
|
|
3
|
+
# timestamp: 2026-04-04T14:14:01+00:00
|
|
4
4
|
|
|
5
5
|
from __future__ import annotations
|
|
6
6
|
|
|
@@ -477,6 +477,10 @@ class DenyReadItem(ClaudeMdExclude):
|
|
|
477
477
|
pass
|
|
478
478
|
|
|
479
479
|
|
|
480
|
+
class AllowReadItem(ClaudeMdExclude):
|
|
481
|
+
pass
|
|
482
|
+
|
|
483
|
+
|
|
480
484
|
class Filesystem(ClaudeCodeBaseModel):
|
|
481
485
|
"""Filesystem access control for sandboxed commands. See https://code.claude.com/docs/en/sandboxing#filesystem-isolation."""
|
|
482
486
|
|
|
@@ -495,6 +499,14 @@ class Filesystem(ClaudeCodeBaseModel):
|
|
|
495
499
|
"""
|
|
496
500
|
Paths where subprocesses are explicitly denied read access
|
|
497
501
|
"""
|
|
502
|
+
allow_read: list[AllowReadItem] | None = Field(None, alias="allowRead")
|
|
503
|
+
"""
|
|
504
|
+
Paths to re-allow reading within denyRead regions. Takes precedence over denyRead for matching paths
|
|
505
|
+
"""
|
|
506
|
+
allow_managed_read_paths_only: bool | None = Field(None, alias="allowManagedReadPathsOnly")
|
|
507
|
+
"""
|
|
508
|
+
When true (managed settings only), only allowRead paths from managed settings are used
|
|
509
|
+
"""
|
|
498
510
|
|
|
499
511
|
|
|
500
512
|
class Sandbox(ClaudeCodeBaseModel):
|
|
@@ -80,6 +80,17 @@ def main() -> None:
|
|
|
80
80
|
).model_dump(by_alias=True)
|
|
81
81
|
print(json.dumps(result))
|
|
82
82
|
sys.stdout.flush()
|
|
83
|
+
|
|
84
|
+
# Emit session state changed to idle (authoritative turn-over signal)
|
|
85
|
+
state_msg = {
|
|
86
|
+
"type": "system",
|
|
87
|
+
"subtype": "session_state_changed",
|
|
88
|
+
"state": "idle",
|
|
89
|
+
"session_id": "test",
|
|
90
|
+
"uuid": "state-idle-001",
|
|
91
|
+
}
|
|
92
|
+
print(json.dumps(state_msg))
|
|
93
|
+
sys.stdout.flush()
|
|
83
94
|
break
|
|
84
95
|
except (json.JSONDecodeError, KeyError):
|
|
85
96
|
pass
|
|
@@ -15,7 +15,7 @@ from clawd_code_sdk import (
|
|
|
15
15
|
ResultMessage,
|
|
16
16
|
ResultSuccessMessage,
|
|
17
17
|
)
|
|
18
|
-
from clawd_code_sdk.models import ModelUsage
|
|
18
|
+
from clawd_code_sdk.models import ModelUsage, SessionStateChangedMessage
|
|
19
19
|
from clawd_code_sdk.session import (
|
|
20
20
|
ConversationTurn,
|
|
21
21
|
Session,
|
|
@@ -27,6 +27,15 @@ from clawd_code_sdk.session import (
|
|
|
27
27
|
from .conftest import make_beta_message
|
|
28
28
|
|
|
29
29
|
|
|
30
|
+
IDLE_STATE_MSG = {
|
|
31
|
+
"type": "system",
|
|
32
|
+
"subtype": "session_state_changed",
|
|
33
|
+
"state": "idle",
|
|
34
|
+
"session_id": "test-session",
|
|
35
|
+
"uuid": "state-idle-001",
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
|
|
30
39
|
def _create_mock_transport_with_messages(messages: list[dict]) -> AsyncMock:
|
|
31
40
|
"""Create a mock transport that handles initialization and returns messages."""
|
|
32
41
|
mock_transport = AsyncMock()
|
|
@@ -246,15 +255,18 @@ class TestSession:
|
|
|
246
255
|
"""send() yields messages and records a ConversationTurn."""
|
|
247
256
|
|
|
248
257
|
async def _test():
|
|
249
|
-
transport = _create_mock_transport_with_messages(
|
|
258
|
+
transport = _create_mock_transport_with_messages(
|
|
259
|
+
[ASSISTANT_MSG, RESULT_MSG, IDLE_STATE_MSG]
|
|
260
|
+
)
|
|
250
261
|
|
|
251
262
|
async with SessionManager() as mgr:
|
|
252
263
|
session = await mgr.create_session("s1", transport=transport)
|
|
253
264
|
assert session.state == "idle"
|
|
254
265
|
messages = [msg async for msg in session.send("hello")]
|
|
255
|
-
assert len(messages) ==
|
|
266
|
+
assert len(messages) == 3
|
|
256
267
|
assert isinstance(messages[0], AssistantMessage)
|
|
257
268
|
assert isinstance(messages[1], ResultMessage)
|
|
269
|
+
assert isinstance(messages[2], SessionStateChangedMessage)
|
|
258
270
|
|
|
259
271
|
assert len(session.turns) == 1
|
|
260
272
|
turn = session.turns[0]
|
|
@@ -270,14 +282,16 @@ class TestSession:
|
|
|
270
282
|
"""send() extracts tool calls from assistant messages."""
|
|
271
283
|
|
|
272
284
|
async def _test():
|
|
273
|
-
transport = _create_mock_transport_with_messages(
|
|
285
|
+
transport = _create_mock_transport_with_messages(
|
|
286
|
+
[TOOL_USE_MSG, RESULT_MSG, IDLE_STATE_MSG]
|
|
287
|
+
)
|
|
274
288
|
|
|
275
289
|
async with SessionManager() as mgr:
|
|
276
290
|
session = await mgr.create_session("s1", transport=transport)
|
|
277
291
|
|
|
278
292
|
messages = [msg async for msg in session.send("read file")]
|
|
279
293
|
|
|
280
|
-
assert len(messages) ==
|
|
294
|
+
assert len(messages) == 3
|
|
281
295
|
assert len(session.turns) == 1
|
|
282
296
|
turn = session.turns[0]
|
|
283
297
|
assert turn.text == "Let me read that."
|
|
@@ -293,7 +307,9 @@ class TestSession:
|
|
|
293
307
|
"""send_and_collect() returns a ConversationTurn directly."""
|
|
294
308
|
|
|
295
309
|
async def _test():
|
|
296
|
-
transport = _create_mock_transport_with_messages(
|
|
310
|
+
transport = _create_mock_transport_with_messages(
|
|
311
|
+
[ASSISTANT_MSG, RESULT_MSG, IDLE_STATE_MSG]
|
|
312
|
+
)
|
|
297
313
|
|
|
298
314
|
async with SessionManager() as mgr:
|
|
299
315
|
session = await mgr.create_session("s1", transport=transport)
|
|
@@ -327,7 +343,7 @@ class TestSession:
|
|
|
327
343
|
result2 = {**RESULT_MSG, "total_cost_usd": 0.010, "uuid": "msg-002"}
|
|
328
344
|
# Transport that returns two rounds of messages
|
|
329
345
|
transport1 = _create_mock_transport_with_messages(
|
|
330
|
-
[ASSISTANT_MSG, RESULT_MSG, ASSISTANT_MSG, result2]
|
|
346
|
+
[ASSISTANT_MSG, RESULT_MSG, IDLE_STATE_MSG, ASSISTANT_MSG, result2, IDLE_STATE_MSG]
|
|
331
347
|
)
|
|
332
348
|
|
|
333
349
|
async with SessionManager() as mgr:
|
|
@@ -551,9 +567,9 @@ class TestSessionManager:
|
|
|
551
567
|
"""total_cost_usd sums across all sessions."""
|
|
552
568
|
|
|
553
569
|
async def _test():
|
|
554
|
-
t1 = _create_mock_transport_with_messages([ASSISTANT_MSG, RESULT_MSG])
|
|
570
|
+
t1 = _create_mock_transport_with_messages([ASSISTANT_MSG, RESULT_MSG, IDLE_STATE_MSG])
|
|
555
571
|
result2 = {**RESULT_MSG, "total_cost_usd": 0.010, "uuid": "msg-002"}
|
|
556
|
-
t2 = _create_mock_transport_with_messages([ASSISTANT_MSG, result2])
|
|
572
|
+
t2 = _create_mock_transport_with_messages([ASSISTANT_MSG, result2, IDLE_STATE_MSG])
|
|
557
573
|
|
|
558
574
|
async with SessionManager() as mgr:
|
|
559
575
|
s1 = await mgr.create_session("a", transport=t1)
|
|
@@ -22,7 +22,7 @@ from clawd_code_sdk import (
|
|
|
22
22
|
)
|
|
23
23
|
from clawd_code_sdk._internal.transport import subprocess_cli
|
|
24
24
|
from clawd_code_sdk._internal.transport.subprocess_cli import SubprocessCLITransport
|
|
25
|
-
from clawd_code_sdk.models import ModelUsage
|
|
25
|
+
from clawd_code_sdk.models import ModelUsage, SessionStateChangedMessage
|
|
26
26
|
|
|
27
27
|
from .conftest import make_beta_message
|
|
28
28
|
|
|
@@ -381,6 +381,13 @@ class TestClaudeSDKClientStreaming:
|
|
|
381
381
|
"cache_read_input_tokens": 0,
|
|
382
382
|
},
|
|
383
383
|
}
|
|
384
|
+
yield {
|
|
385
|
+
"type": "system",
|
|
386
|
+
"subtype": "session_state_changed",
|
|
387
|
+
"state": "idle",
|
|
388
|
+
"session_id": "test",
|
|
389
|
+
"uuid": "state-idle-001",
|
|
390
|
+
}
|
|
384
391
|
# This should not be yielded
|
|
385
392
|
yield {
|
|
386
393
|
"type": "assistant",
|
|
@@ -393,10 +400,11 @@ class TestClaudeSDKClientStreaming:
|
|
|
393
400
|
|
|
394
401
|
async with ClaudeSDKClient() as client:
|
|
395
402
|
messages = [msg async for msg in client.receive_response()]
|
|
396
|
-
# Should
|
|
397
|
-
assert len(messages) ==
|
|
403
|
+
# Should get 3 messages (assistant + result + idle state change)
|
|
404
|
+
assert len(messages) == 3
|
|
398
405
|
assert isinstance(messages[0], AssistantMessage)
|
|
399
406
|
assert isinstance(messages[1], ResultMessage)
|
|
407
|
+
assert isinstance(messages[2], SessionStateChangedMessage)
|
|
400
408
|
|
|
401
409
|
anyio.run(_test)
|
|
402
410
|
|
|
@@ -582,10 +590,11 @@ class TestQueryWithMultiplePrompts:
|
|
|
582
590
|
|
|
583
591
|
with patch.object(SubprocessCLITransport, "_build_command", mock_build_command):
|
|
584
592
|
messages = [msg async for msg in ClaudeSDKClient.one_shot("First", "Second")]
|
|
585
|
-
# Should get
|
|
586
|
-
assert len(messages) ==
|
|
593
|
+
# Should get result + idle state change
|
|
594
|
+
assert len(messages) == 2
|
|
587
595
|
assert isinstance(messages[0], ResultMessage)
|
|
588
596
|
assert messages[0].subtype == "success"
|
|
597
|
+
assert isinstance(messages[1], SessionStateChangedMessage)
|
|
589
598
|
|
|
590
599
|
anyio.run(_test)
|
|
591
600
|
|
|
@@ -16,7 +16,10 @@ from clawd_code_sdk import (
|
|
|
16
16
|
)
|
|
17
17
|
from clawd_code_sdk._internal.query import Query
|
|
18
18
|
from clawd_code_sdk._internal.transport import Transport
|
|
19
|
-
from clawd_code_sdk.models import
|
|
19
|
+
from clawd_code_sdk.models import (
|
|
20
|
+
SDKControlPermissionRequest,
|
|
21
|
+
incoming_control_request_adapter as control_request_adapter,
|
|
22
|
+
)
|
|
20
23
|
|
|
21
24
|
|
|
22
25
|
async def _dispatch(query: Query, request: dict[str, Any]) -> None:
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/_internal/transport/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/anthropic_types.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/prompt_requests.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{clawd_code_sdk-1.0.27 → clawd_code_sdk-1.0.28}/src/clawd_code_sdk/models/system_messages.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|