clawd-code-sdk 1.1.5__tar.gz → 1.1.7__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.
Files changed (89) hide show
  1. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/PKG-INFO +2 -2
  2. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/pyproject.toml +1 -1
  3. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/__init__.py +1 -1
  4. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/_errors.py +7 -0
  5. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/_internal/query.py +2 -0
  6. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/_internal/session_mutations.py +22 -53
  7. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/_internal/transport/subprocess_utils.py +25 -7
  8. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/client.py +175 -12
  9. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/__init__.py +103 -1
  10. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/agents.py +22 -0
  11. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/base.py +118 -18
  12. clawd_code_sdk-1.1.7/src/clawd_code_sdk/models/context_usage.py +319 -0
  13. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/control.py +217 -2
  14. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/hooks.py +165 -1
  15. clawd_code_sdk-1.1.7/src/clawd_code_sdk/models/input_types.py +1136 -0
  16. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/mcp.py +25 -4
  17. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/messages.py +262 -8
  18. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/options.py +50 -0
  19. clawd_code_sdk-1.1.7/src/clawd_code_sdk/models/output_types.py +1986 -0
  20. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/server_info.py +85 -4
  21. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/session.py +3 -0
  22. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/settings.py +1060 -44
  23. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/system_messages.py +216 -4
  24. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/thinking.py +1 -1
  25. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/usage.py +67 -0
  26. clawd_code_sdk-1.1.7/tests/test_sdk_0_3_types.py +187 -0
  27. clawd_code_sdk-1.1.5/src/clawd_code_sdk/models/context_usage.py +0 -151
  28. clawd_code_sdk-1.1.5/src/clawd_code_sdk/models/input_types.py +0 -387
  29. clawd_code_sdk-1.1.5/src/clawd_code_sdk/models/output_types.py +0 -907
  30. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/.gitignore +0 -0
  31. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/LICENSE +0 -0
  32. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/README.md +0 -0
  33. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/_bundled/.gitignore +0 -0
  34. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/_internal/__init__.py +0 -0
  35. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/_internal/sessions.py +0 -0
  36. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/_internal/transport/__init__.py +0 -0
  37. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/_internal/transport/subprocess_cli.py +0 -0
  38. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/_version.py +0 -0
  39. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/anthropic_stream.py +0 -0
  40. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/instrumentation.py +0 -0
  41. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/list_sessions.py +0 -0
  42. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/mcp_utils.py +0 -0
  43. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/anthropic_types.py +0 -0
  44. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/content_blocks.py +0 -0
  45. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/permissions.py +0 -0
  46. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/prompt_requests.py +0 -0
  47. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/models/prompts.py +0 -0
  48. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/py.typed +0 -0
  49. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/session.py +0 -0
  50. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/storage/ARCHITECTURE.md +0 -0
  51. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/storage/__init__.py +0 -0
  52. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/storage/helpers.py +0 -0
  53. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/storage/models.py +0 -0
  54. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/storage/replay.py +0 -0
  55. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/src/clawd_code_sdk/usage.py +0 -0
  56. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/__init__.py +0 -0
  57. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/conftest.py +0 -0
  58. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/__init__.py +0 -0
  59. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_agents_and_settings.py +0 -0
  60. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_dynamic_control.py +0 -0
  61. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_hook_events.py +0 -0
  62. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_hooks.py +0 -0
  63. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_include_partial_messages.py +0 -0
  64. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_mcp_resources.py +0 -0
  65. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_mcp_tools.py +0 -0
  66. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_sdk_mcp_resources.py +0 -0
  67. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_sdk_mcp_tools.py +0 -0
  68. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_slash_commands.py +0 -0
  69. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_stderr_callback.py +0 -0
  70. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_storage_parsing.py +0 -0
  71. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_structured_output.py +0 -0
  72. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_subagent_invocation.py +0 -0
  73. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/e2e/test_tool_permissions.py +0 -0
  74. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/mcp_server.py +0 -0
  75. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/mock_claude_server.py +0 -0
  76. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_changelog.py +0 -0
  77. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_client.py +0 -0
  78. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_errors.py +0 -0
  79. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_image.png +0 -0
  80. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_integration.py +0 -0
  81. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_message_parser.py +0 -0
  82. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_sdk_mcp_integration.py +0 -0
  83. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_session.py +0 -0
  84. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_session_mutations.py +0 -0
  85. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_sessions.py +0 -0
  86. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_streaming_client.py +0 -0
  87. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_subprocess_buffering.py +0 -0
  88. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_tool_callbacks.py +0 -0
  89. {clawd_code_sdk-1.1.5 → clawd_code_sdk-1.1.7}/tests/test_transport.py +0 -0
@@ -1,6 +1,6 @@
1
- Metadata-Version: 2.4
1
+ Metadata-Version: 2.5
2
2
  Name: clawd-code-sdk
3
- Version: 1.1.5
3
+ Version: 1.1.7
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
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "clawd-code-sdk"
3
- version = "1.1.5"
3
+ version = "1.1.7"
4
4
  description = "Python SDK for Claude Code"
5
5
  readme = "README.md"
6
6
  requires-python = ">=3.13"
@@ -138,7 +138,7 @@ from .session import (
138
138
 
139
139
  # MCP Server Support
140
140
 
141
- __cli_version__ = "2.1.11"
141
+ __cli_version__ = "2.1.325"
142
142
 
143
143
 
144
144
  __all__ = [
@@ -62,11 +62,18 @@ class MessageParseError(ClaudeSDKError):
62
62
  # These correspond to the error types in types.AssistantMessageError
63
63
  APIErrorType = Literal[
64
64
  "authentication_failed",
65
+ "oauth_org_not_allowed",
66
+ "account_on_hold",
67
+ "verification_required",
65
68
  "billing_error",
66
69
  "rate_limit",
70
+ "overloaded",
67
71
  "invalid_request",
72
+ "model_not_found",
68
73
  "server_error",
69
74
  "unknown",
75
+ "max_output_tokens",
76
+ "cloud_credential_error",
70
77
  ]
71
78
 
72
79
 
@@ -174,6 +174,8 @@ class Query:
174
174
  matcher_cfg = {"matcher": matcher.get("matcher"), "hookCallbackIds": callback_ids}
175
175
  if matcher.get("timeout") is not None:
176
176
  matcher_cfg["timeout"] = matcher.get("timeout")
177
+ if matcher.get("on_failure") is not None:
178
+ matcher_cfg["onFailure"] = matcher.get("on_failure")
177
179
  hooks_config[event].append(matcher_cfg)
178
180
  return hooks_config or None
179
181
 
@@ -52,11 +52,7 @@ if TYPE_CHECKING:
52
52
  # ---------------------------------------------------------------------------
53
53
 
54
54
 
55
- def rename_session(
56
- session_id: str,
57
- title: str,
58
- directory: str | None = None,
59
- ) -> None:
55
+ def rename_session(session_id: str, title: str, directory: str | None = None) -> None:
60
56
  """Rename a session by appending a custom-title entry.
61
57
 
62
58
  ``list_sessions`` reads the LAST custom-title from the file tail, so
@@ -429,10 +425,7 @@ def fork_session(
429
425
  # ---------------------------------------------------------------------------
430
426
 
431
427
 
432
- def _find_session_file(
433
- session_id: str,
434
- directory: str | None,
435
- ) -> Path | None:
428
+ def _find_session_file(session_id: str, directory: str | None) -> Path | None:
436
429
  """Find the path to a session's JSONL file.
437
430
 
438
431
  Returns the path if found, None otherwise.
@@ -441,10 +434,7 @@ def _find_session_file(
441
434
  return result[0] if result else None
442
435
 
443
436
 
444
- def _find_session_file_with_dir(
445
- session_id: str,
446
- directory: str | None,
447
- ) -> tuple[Path, Path] | None:
437
+ def _find_session_file_with_dir(session_id: str, directory: str | None) -> tuple[Path, Path] | None:
448
438
  """Find a session file and its containing project directory.
449
439
 
450
440
  Returns ``(file_path, project_dir)`` or None. The fork operation
@@ -455,8 +445,7 @@ def _find_session_file_with_dir(
455
445
  def _try_dir(project_dir: Path) -> tuple[Path, Path] | None:
456
446
  path = project_dir / file_name
457
447
  try:
458
- st = path.stat()
459
- if st.st_size > 0:
448
+ if path.stat().st_size > 0:
460
449
  return (path, project_dir)
461
450
  except OSError:
462
451
  pass
@@ -464,20 +453,13 @@ def _find_session_file_with_dir(
464
453
 
465
454
  if directory:
466
455
  canonical = _canonicalize_path(directory)
467
- project_dir = _find_project_dir(canonical)
468
- if project_dir is not None:
469
- result = _try_dir(project_dir)
470
- if result:
471
- return result
472
-
456
+ if (project_dir := _find_project_dir(canonical)) and (result := _try_dir(project_dir)):
457
+ return result
473
458
  for wt in _get_worktree_paths(canonical):
474
459
  if wt == canonical:
475
460
  continue
476
- wt_project_dir = _find_project_dir(wt)
477
- if wt_project_dir is not None:
478
- result = _try_dir(wt_project_dir)
479
- if result:
480
- return result
461
+ if (wt_project_dir := _find_project_dir(wt)) and (result := _try_dir(wt_project_dir)):
462
+ return result
481
463
  return None
482
464
 
483
465
  projects_dir = _get_projects_dir()
@@ -486,8 +468,7 @@ def _find_session_file_with_dir(
486
468
  except OSError:
487
469
  return None
488
470
  for entry in dirents:
489
- result = _try_dir(entry)
490
- if result:
471
+ if result := _try_dir(entry):
491
472
  return result
492
473
  return None
493
474
 
@@ -514,22 +495,16 @@ def _parse_fork_transcript(
514
495
  entry = anyenv.load_json(stripped, return_type=dict)
515
496
  except (anyenv.JsonLoadError, ValueError):
516
497
  continue
517
- # match entry:
518
- # case {
519
- # "type": "user" | "assistant" | "attachment" | "system" | "progress" as typ,
520
- # "uuid": str(id_),
521
- # }:
522
- # pass
523
- entry_type = entry.get("type")
524
- if entry_type in _TRANSCRIPT_TYPES and isinstance(entry.get("uuid"), str):
525
- transcript.append(entry)
526
- elif (
527
- entry_type == "content-replacement"
528
- and entry.get("sessionId") == session_id
529
- and isinstance(entry.get("replacements"), list)
530
- ):
531
- content_replacements.extend(entry["replacements"])
532
-
498
+ match entry:
499
+ case {
500
+ "type": "user" | "assistant" | "attachment" | "system" | "progress",
501
+ "uuid": str(),
502
+ }:
503
+ transcript.append(entry)
504
+ case {"type": "content-replacement", "sessionId": str(sid), "replacements": list()} if (
505
+ sid == session_id
506
+ ):
507
+ content_replacements.extend(entry["replacements"])
533
508
  return transcript, content_replacements
534
509
 
535
510
 
@@ -545,23 +520,17 @@ def _append_to_session(session_id: str, data: str, directory: str | None) -> Non
545
520
  if directory:
546
521
  canonical = _canonicalize_path(directory)
547
522
  # Try the exact/prefix-matched project directory first.
548
- project_dir = _find_project_dir(canonical)
549
- if project_dir is not None and _try_append(project_dir / file_name, data):
523
+ if (proj_dir := _find_project_dir(canonical)) and _try_append(proj_dir / file_name, data):
550
524
  return
551
-
552
525
  # Worktree fallback — matches list_sessions/get_session_messages.
553
526
  # Sessions may live under a different worktree root.
554
527
  for wt in _get_worktree_paths(canonical):
555
528
  if wt == canonical:
556
529
  continue # already tried above
557
- wt_project_dir = _find_project_dir(wt)
558
- if wt_project_dir is not None and _try_append(wt_project_dir / file_name, data):
530
+ if (proj_dir := _find_project_dir(wt)) and _try_append(proj_dir / file_name, data):
559
531
  return
560
532
 
561
- raise FileNotFoundError(
562
- f"Session {session_id} not found in project directory for {directory}"
563
- )
564
-
533
+ raise FileNotFoundError(f"{session_id=} not found in project {directory=}")
565
534
  # No directory — search all project directories by trying each directly.
566
535
  projects_dir = _get_projects_dir()
567
536
  try:
@@ -176,6 +176,12 @@ def to_cli_args(options: ClaudeAgentOptions) -> list[str]:
176
176
  if options.permission_mode:
177
177
  cmd.extend(["--permission-mode", options.permission_mode])
178
178
 
179
+ if options.permission_prompts:
180
+ cmd.extend(["--permission-prompts", options.permission_prompts])
181
+
182
+ if options.project_config_root is not None:
183
+ cmd.append(f"--project-config-root={options.project_config_root}")
184
+
179
185
  session = options.get_session()
180
186
  match session:
181
187
  case NewSession(session_id=str() as sid):
@@ -187,7 +193,9 @@ def to_cli_args(options: ClaudeAgentOptions) -> list[str]:
187
193
  if fork:
188
194
  cmd.append("--fork-session")
189
195
  if at_msg is not None:
190
- cmd.extend(["--resume-session-at", at_msg])
196
+ cmd.append(f"--resume-session-at={at_msg}")
197
+ if session.drops_turn is not None:
198
+ cmd.append(f"--resume-drops-turn={session.drops_turn}")
191
199
  case ContinueLatest(fork=fork):
192
200
  cmd.append("--continue")
193
201
  if fork:
@@ -200,7 +208,7 @@ def to_cli_args(options: ClaudeAgentOptions) -> list[str]:
200
208
  assert_never(unreachable)
201
209
 
202
210
  if not session.persist:
203
- cmd.append("--no-persist-session")
211
+ cmd.append("--no-session-persistence")
204
212
 
205
213
  # Handle settings and sandbox: merge sandbox into settings if both are provided
206
214
  if settings_value := options.build_settings_value():
@@ -214,7 +222,11 @@ def to_cli_args(options: ClaudeAgentOptions) -> list[str]:
214
222
  match options.mcp_servers:
215
223
  case dict() as servers if servers:
216
224
  servers_for_cli = {
217
- name: {k: v for k, v in dataclasses.asdict(cfg).items() if k != "instance"}
225
+ name: {
226
+ k: v
227
+ for k, v in dataclasses.asdict(cfg).items()
228
+ if k != "instance" and v is not None
229
+ }
218
230
  for name, cfg in servers.items()
219
231
  }
220
232
  dct = anyenv.dump_json({"mcpServers": servers_for_cli})
@@ -256,6 +268,8 @@ def to_cli_args(options: ClaudeAgentOptions) -> list[str]:
256
268
  # Add plugin directories
257
269
  for plugin in options.plugins:
258
270
  match plugin:
271
+ case SdkPluginConfig(skip_mcp_discovery=True):
272
+ cmd.extend(["--plugin-dir-no-mcp", plugin.path])
259
273
  case SdkPluginConfig():
260
274
  cmd.extend(["--plugin-dir", plugin.path])
261
275
  case _:
@@ -268,12 +282,16 @@ def to_cli_args(options: ClaudeAgentOptions) -> list[str]:
268
282
 
269
283
  # Resolve thinking config → --max-thinking-tokens
270
284
  match options.thinking:
271
- case ThinkingConfigAdaptive():
272
- cmd.extend(["--max-thinking-tokens", "32000"])
273
- case ThinkingConfigEnabled(budget_tokens=budget):
285
+ case ThinkingConfigAdaptive(display=display):
286
+ cmd.append("--thinking=adaptive")
287
+ if display:
288
+ cmd.extend(["--thinking-display", display])
289
+ case ThinkingConfigEnabled(budget_tokens=budget, display=display):
274
290
  cmd.extend(["--max-thinking-tokens", str(budget)])
291
+ if display:
292
+ cmd.extend(["--thinking-display", display])
275
293
  case ThinkingConfigDisabled():
276
- cmd.extend(["--max-thinking-tokens", "0"])
294
+ cmd.append("--thinking=disabled")
277
295
 
278
296
  if options.effort is not None:
279
297
  cmd.extend(["--effort", options.effort])
@@ -4,7 +4,7 @@ from __future__ import annotations
4
4
 
5
5
  import os
6
6
  from pathlib import Path
7
- from typing import TYPE_CHECKING, Any, Self, cast
7
+ from typing import TYPE_CHECKING, Any, Literal, Self, cast
8
8
 
9
9
  import anyenv
10
10
  from pydantic import ValidationError
@@ -14,6 +14,7 @@ from clawd_code_sdk._internal.query import Query
14
14
  from clawd_code_sdk.models import (
15
15
  AssistantMessage,
16
16
  ClaudeAgentOptions,
17
+ ClaudeCodeModelInfo,
17
18
  ClaudeCodeServerInfo,
18
19
  ClaudeOAuthWaitForCompletionResponse,
19
20
  GetSettingsResponse,
@@ -25,25 +26,41 @@ from clawd_code_sdk.models import (
25
26
  ResultErrorMessage,
26
27
  ResultSuccessMessage,
27
28
  SDKControlApplyFlagSettingsRequest,
29
+ SDKControlBackgroundTasksRequest,
28
30
  SDKControlCancelAsyncMessageRequest,
29
31
  SDKControlChannelEnableRequest,
30
32
  SDKControlClaudeOAuthWaitForCompletionRequest,
31
33
  SDKControlEndSessionRequest,
34
+ SDKControlGetBinaryVersionRequest,
32
35
  SDKControlGetContextUsageRequest,
33
36
  SDKControlGetContextUsageResponse,
37
+ SDKControlGetHooksListingRequest,
34
38
  SDKControlGetSettingsRequest,
39
+ SDKControlGetTaskOutputRequest,
40
+ SDKControlGetTaskOutputResponse,
41
+ SDKControlGetUsageRequest,
35
42
  SDKControlInitializeRequest,
36
43
  SDKControlInterruptRequest,
44
+ SDKControlInterruptResponse,
45
+ SDKControlListModelsRequest,
46
+ SDKControlListPermissionRulesRequest,
37
47
  SDKControlMcpAuthenticateRequest,
38
48
  SDKControlMcpCallRequest,
39
49
  SDKControlMcpClearAuthRequest,
40
50
  SDKControlMcpOAuthCallbackUrlRequest,
51
+ SDKControlMcpReadResourceRequest,
52
+ SDKControlMcpReadResourceResponse,
41
53
  SDKControlMcpReconnectRequest,
42
54
  SDKControlMcpSetServersRequest,
43
55
  SDKControlMcpStatusRequest,
44
56
  SDKControlMcpToggleRequest,
45
57
  SDKControlReadFileRequest,
46
58
  SDKControlReadFileResponse,
59
+ SDKControlRegisterRepoRootRequest,
60
+ SDKControlReloadOutputStylesRequest,
61
+ SDKControlReloadOutputStylesResponse,
62
+ SDKControlReloadSkillsRequest,
63
+ SDKControlReloadSkillsResponse,
47
64
  SDKControlRemoteControlRequest,
48
65
  SDKControlRewindFilesRequest,
49
66
  SDKControlSeedReadStateRequest,
@@ -52,6 +69,7 @@ from clawd_code_sdk.models import (
52
69
  SDKControlSetPermissionModeRequest,
53
70
  SDKControlSideQuestionRequest,
54
71
  SDKControlStopTaskRequest,
72
+ SDKControlUpdateSettingsRequest,
55
73
  SessionStateChangedMessage,
56
74
  SideQuestionResponse,
57
75
  StatusSystemMessage,
@@ -68,6 +86,7 @@ if TYPE_CHECKING:
68
86
  from clawd_code_sdk import Transport
69
87
  from clawd_code_sdk.models import (
70
88
  ClaudeCodeAgentInfo,
89
+ ClaudeCodeCommandInfo,
71
90
  ClaudeCodeSettings,
72
91
  ExternalMcpServerConfig,
73
92
  McpServerStatusEntry,
@@ -208,9 +227,31 @@ class ClaudeSDKClient:
208
227
  agent_progress_summaries=options.agent_progress_summaries,
209
228
  title=title,
210
229
  skills=options.skills,
230
+ plan_mode_instructions=options.plan_mode_instructions,
231
+ system_prompt_snapshot=options.system_prompt_snapshot,
232
+ forward_subagent_text=options.forward_subagent_text or None,
233
+ tool_aliases=options.tool_aliases,
234
+ per_task_stop_affordance=options.per_task_stop_affordance,
211
235
  )
212
236
  response = await query._send_control_request(request, timeout=initialize_timeout)
213
- self._initialization_result = ClaudeCodeServerInfo.model_validate(response)
237
+ self._initialization_result = info = ClaudeCodeServerInfo.model_validate(response)
238
+ blocks_on_failure = any(
239
+ m.on_failure not in (None, "continue")
240
+ for matchers in (options.hooks or {}).values()
241
+ for m in matchers
242
+ )
243
+ if blocks_on_failure:
244
+ if not info.hook_on_failure_supported:
245
+ raise CLIConnectionError(
246
+ "The process answering initialize does not honor on_failure on hook "
247
+ "matchers, so a failing hook would not block. "
248
+ 'Update Claude Code or remove on_failure="block".'
249
+ )
250
+ if info.hooks_applied is False:
251
+ raise CLIConnectionError(
252
+ "This session was already running and did not register your hooks, "
253
+ 'so a hook set to on_failure="block" would never run.'
254
+ )
214
255
 
215
256
  async def receive_messages(self) -> AsyncIterator[Message]:
216
257
  """Receive all messages from Claude."""
@@ -277,16 +318,27 @@ class ClaudeSDKClient:
277
318
  "message": {"role": "user", "content": message_content},
278
319
  "parent_tool_use_id": parent_tool_use_id,
279
320
  "session_id": session_id,
280
- "should_query": should_query,
321
+ "shouldQuery": should_query,
281
322
  "priority": priority,
282
323
  }
324
+ if self.options.verbatim_prompts:
325
+ wire_message["client_composed"] = True
283
326
  await self._query.write_json(wire_message)
284
327
 
285
- async def interrupt(self) -> None:
286
- """Send interrupt signal (only works with streaming mode)."""
328
+ async def interrupt(self, *, cancel_queued: bool = False) -> SDKControlInterruptResponse | None:
329
+ """Send interrupt signal (only works with streaming mode).
330
+
331
+ Args:
332
+ cancel_queued: Also cancel queued (not yet started) user messages.
333
+
334
+ Returns:
335
+ Which queued messages are still queued / were cancelled
336
+ (None on CLIs that don't report it).
337
+ """
287
338
  query = self._ensure_connected()
288
- request = SDKControlInterruptRequest()
289
- await query._send_control_request(request)
339
+ request = SDKControlInterruptRequest(cancel_queued=cancel_queued or None)
340
+ result = await query._send_control_request(request)
341
+ return SDKControlInterruptResponse.model_validate(result) if result else None
290
342
 
291
343
  async def set_permission_mode(self, mode: PermissionMode) -> None:
292
344
  """Change permission mode during conversation (only works with streaming mode).
@@ -468,13 +520,22 @@ class ClaudeSDKClient:
468
520
  result = await query._send_control_request(request)
469
521
  return GetSettingsResponse.model_validate(result)
470
522
 
471
- async def get_context_usage(self) -> SDKControlGetContextUsageResponse:
523
+ async def get_context_usage(
524
+ self, detail: Literal["summary", "full"] | None = None
525
+ ) -> SDKControlGetContextUsageResponse:
472
526
  """Get a breakdown of current context window usage by category."""
473
527
  query = self._ensure_connected()
474
- request = SDKControlGetContextUsageRequest()
528
+ request = SDKControlGetContextUsageRequest(detail=detail)
475
529
  result = await query._send_control_request(request)
476
530
  return SDKControlGetContextUsageResponse.model_validate(result)
477
531
 
532
+ # async def get_session_cost(self) -> SDKControlGetSessionCostResponse:
533
+ # """Get the formatted session cost summary (the same text as /usage)."""
534
+ # query = self._ensure_connected()
535
+ # request = SDKControlGetSessionCostRequest()
536
+ # result = await query._send_control_request(request)
537
+ # return SDKControlGetSessionCostResponse.model_validate(result)
538
+
478
539
  async def mcp_authenticate(self, server_name: str) -> McpAuthenticateResponse:
479
540
  """Trigger OAuth authentication for an MCP server.
480
541
 
@@ -538,12 +599,114 @@ class ClaudeSDKClient:
538
599
  req = SDKControlChannelEnableRequest(server_name=server_name)
539
600
  await query._send_control_request(req)
540
601
 
541
- async def set_max_thinking_tokens(self, max_thinking_tokens: int) -> None:
542
- """Set the maximum number of thinking tokens for extended thinking."""
602
+ async def set_max_thinking_tokens(
603
+ self,
604
+ max_thinking_tokens: int | None,
605
+ thinking_display: Literal["summarized", "omitted", "highlights"] | None = None,
606
+ ) -> None:
607
+ """Set the maximum number of thinking tokens (and optionally the display mode)."""
608
+ query = self._ensure_connected()
609
+ request = SDKControlSetMaxThinkingTokensRequest(
610
+ max_thinking_tokens=max_thinking_tokens, thinking_display=thinking_display
611
+ )
612
+ await query._send_control_request(request)
613
+
614
+ async def background_tasks(self, tool_use_id: str | None = None) -> bool:
615
+ """Move running foreground tasks (or a single tool use) to the background.
616
+
617
+ Returns:
618
+ Whether anything was backgrounded.
619
+ """
620
+ query = self._ensure_connected()
621
+ request = SDKControlBackgroundTasksRequest(tool_use_id=tool_use_id)
622
+ result = await query._send_control_request(request)
623
+ return bool((result or {}).get("backgrounded", True))
624
+
625
+ async def get_task_output(self, task_id: str) -> SDKControlGetTaskOutputResponse:
626
+ """Read the output collected so far for a background task."""
627
+ query = self._ensure_connected()
628
+ request = SDKControlGetTaskOutputRequest(task_id=task_id)
629
+ result = await query._send_control_request(request)
630
+ return SDKControlGetTaskOutputResponse.model_validate(result)
631
+
632
+ async def get_usage(self, *, skip_behaviors: bool = False) -> dict[str, Any]:
633
+ """Get the structured usage report (experimental, shape may change)."""
634
+ query = self._ensure_connected()
635
+ request = SDKControlGetUsageRequest(skip_behaviors=skip_behaviors or None)
636
+ return await query._send_control_request(request)
637
+
638
+ async def get_binary_version(self) -> dict[str, Any]:
639
+ """Get version info of the running Claude Code binary."""
640
+ query = self._ensure_connected()
641
+ return await query._send_control_request(SDKControlGetBinaryVersionRequest())
642
+
643
+ async def list_models(self) -> list[ClaudeCodeModelInfo]:
644
+ """Fetch the list of available models from the CLI."""
543
645
  query = self._ensure_connected()
544
- request = SDKControlSetMaxThinkingTokensRequest(max_thinking_tokens=max_thinking_tokens)
646
+ result = await query._send_control_request(SDKControlListModelsRequest())
647
+ return [ClaudeCodeModelInfo.model_validate(m) for m in (result or {}).get("models", [])]
648
+
649
+ async def reload_skills(self) -> list[ClaudeCodeCommandInfo]:
650
+ """Re-scan skills from disk and return the refreshed skill list."""
651
+ query = self._ensure_connected()
652
+ result = await query._send_control_request(SDKControlReloadSkillsRequest())
653
+ return SDKControlReloadSkillsResponse.model_validate(result).skills
654
+
655
+ async def reload_output_styles(self) -> list[str]:
656
+ """Re-scan output styles from disk and return the available style names."""
657
+ query = self._ensure_connected()
658
+ result = await query._send_control_request(SDKControlReloadOutputStylesRequest())
659
+ return SDKControlReloadOutputStylesResponse.model_validate(result).available_output_styles
660
+
661
+ async def read_mcp_resource(
662
+ self, server_name: str, uri: str
663
+ ) -> SDKControlMcpReadResourceResponse:
664
+ """Read a resource from a connected MCP server."""
665
+ query = self._ensure_connected()
666
+ request = SDKControlMcpReadResourceRequest(server_name=server_name, uri=uri)
667
+ result = await query._send_control_request(request)
668
+ return SDKControlMcpReadResourceResponse.model_validate(result)
669
+
670
+ async def update_settings(
671
+ self,
672
+ source: Literal["localSettings", "userSettings"],
673
+ settings: dict[str, Any],
674
+ ) -> None:
675
+ """Persist settings to the local or user settings file."""
676
+ query = self._ensure_connected()
677
+ request = SDKControlUpdateSettingsRequest(source=source, settings=settings)
678
+ await query._send_control_request(request)
679
+
680
+ async def list_permission_rules(self) -> dict[str, Any]:
681
+ """List the effective permission rules (raw ``state`` payload)."""
682
+ query = self._ensure_connected()
683
+ result = await query._send_control_request(SDKControlListPermissionRulesRequest())
684
+ state: dict[str, Any] = (result or {}).get("state", {})
685
+ return state
686
+
687
+ async def register_repo_root(
688
+ self,
689
+ directory: str | Path,
690
+ *,
691
+ reload_claude_md: bool | None = None,
692
+ reload_plugins: bool | None = None,
693
+ reload_skills: bool | None = None,
694
+ ) -> None:
695
+ """Register an additional repository root for the session (like /add-dir)."""
696
+ query = self._ensure_connected()
697
+ request = SDKControlRegisterRepoRootRequest(
698
+ directory=str(directory),
699
+ reload_claude_md=reload_claude_md,
700
+ reload_plugins=reload_plugins,
701
+ reload_skills=reload_skills,
702
+ )
545
703
  await query._send_control_request(request)
546
704
 
705
+ async def get_hooks_listing(self) -> dict[str, Any]:
706
+ """Get the listing of configured hooks (same data as /hooks)."""
707
+ query = self._ensure_connected()
708
+ return await query._send_control_request(SDKControlGetHooksListingRequest())
709
+
547
710
  async def supported_agents(self) -> list[ClaudeCodeAgentInfo]:
548
711
  """Get the list of available subagents for the current session.
549
712