deepstrike 0.2.24__tar.gz → 0.2.26__tar.gz

{deepstrike-0.2.24 → deepstrike-0.2.26}/Cargo.lock

@@ -194,7 +194,7 @@ dependencies = [
 
 [[package]]
 name = "deepstrike-core"
-version = "0.2.24"
+version = "0.2.26"
 dependencies = [
  "compact_str",
  "pretty_assertions",
@@ -206,7 +206,7 @@ dependencies = [
 
 [[package]]
 name = "deepstrike-node"
-version = "0.2.24"
+version = "0.2.26"
 dependencies = [
  "compact_str",
  "deepstrike-core",
@@ -218,7 +218,7 @@ dependencies = [
 
 [[package]]
 name = "deepstrike-py"
-version = "0.2.24"
+version = "0.2.26"
 dependencies = [
  "compact_str",
  "deepstrike-core",
@@ -229,7 +229,7 @@ dependencies = [
 
 [[package]]
 name = "deepstrike-sdk"
-version = "0.2.24"
+version = "0.2.26"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -263,7 +263,7 @@ dependencies = [
 
 [[package]]
 name = "deepstrike-wasm"
-version = "0.2.24"
+version = "0.2.26"
 dependencies = [
  "compact_str",
  "deepstrike-core",

{deepstrike-0.2.24 → deepstrike-0.2.26}/Cargo.toml

@@ -3,13 +3,13 @@ resolver = "2"
 members = ["crates/deepstrike-core", "crates/deepstrike-py"]
 
 [workspace.package]
-version = "0.2.24"
+version = "0.2.26"
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/kongusen/deepstrike"
 
 [workspace.dependencies]
-deepstrike-core = { path = "crates/deepstrike-core", version = "0.2.24" }
+deepstrike-core = { path = "crates/deepstrike-core", version = "0.2.26" }
 notify = "6"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

{deepstrike-0.2.24 → deepstrike-0.2.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepstrike
-Version: 0.2.24
+Version: 0.2.26
 Requires-Dist: httpx>=0.27
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: anyio>=4.0

{deepstrike-0.2.24 → deepstrike-0.2.26}/deepstrike/tools/registry.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+import copy
 import inspect
 import json
 from collections.abc import AsyncIterable
@@ -83,6 +84,20 @@ def _validate_value(schema: dict[str, Any], parent: Any, key: Any, path: str, st
     value = parent[key]
     expected = schema.get("type")
 
+    # 0. 多态联合 (oneOf / anyOf) —— 先于单一 type 分支匹配
+    union = schema.get("oneOf") or schema.get("anyOf")
+    if isinstance(union, list):
+        for sub in union:
+            # 先深拷贝再试：避免某分支的 auto-cast/裁剪部分改写后又失败，污染后续分支
+            probe = {"v": copy.deepcopy(parent[key])}
+            probe_state = {"repaired": False}
+            if _validate_value(sub, probe, "v", path, probe_state) is None:
+                parent[key] = probe["v"]  # 接受首个匹配分支(连同它内部的 repair)
+                if probe_state["repaired"]:
+                    state["repaired"] = True
+                return None
+        return f"{path} does not match any allowed shape"
+
     # 1. 类型自动规整 (Auto-cast)
     if isinstance(expected, str):
         if expected == "boolean":
@@ -127,13 +142,23 @@ def _validate_value(schema: dict[str, Any], parent: Any, key: Any, path: str, st
             if not isinstance(value, dict):
                 return f"{path} must be object"
 
-            # 3a. 裁剪多余字段
+            # 3a. 裁剪多余字段 —— 尊重 additionalProperties。
+            # 缺省/False 维持旧的"裁剪"行为（所有现存工具都依赖它）；只有显式 True 或子 schema 才放行。
             properties = schema.get("properties", {})
             allowed_keys = set(properties.keys())
-            keys_to_remove = [k for k in value.keys() if k not in allowed_keys]
-            if keys_to_remove:
-                for k in keys_to_remove:
-                    del value[k]
+            additional = schema.get("additionalProperties")
+            for obj_key in list(value.keys()):
+                if obj_key in allowed_keys:
+                    continue
+                if additional is True:
+                    continue  # 任意键放行：不校验、不裁剪
+                if isinstance(additional, dict):
+                    # 用子 schema 递归校验每个额外键的值（也会 auto-cast / 补默认）
+                    err = _validate_value(additional, value, obj_key, f"{path}.{obj_key}", state)
+                    if err:
+                        return err
+                    continue
+                del value[obj_key]  # additionalProperties 缺省/False → 维持旧行为
                 state["repaired"] = True
 
             for required in schema.get("required", []):

{deepstrike-0.2.24 → deepstrike-0.2.26}/deepstrike/types/agent.py

@@ -166,6 +166,17 @@ def milestone_check_fail(phase_id: str, reason: str) -> MilestoneCheckResult:
   return MilestoneCheckResult(phase_id=phase_id, passed=False, reason=reason)
 
 
+def _safe_parse_tool_args(raw: str | None) -> dict[str, Any]:
+  """Tool-call ``arguments`` reach us as a raw model-authored string (e.g. the OpenAIChat-family
+  non-streaming path passes it through verbatim). A malformed JSON string must degrade to empty
+  args here, never raise — otherwise one bad tool-call on a sub-agent's final turn bricks the
+  parent's result serialization. Mirrors the ``except -> {}`` guard every provider parse site uses."""
+  try:
+    return json.loads(raw or "{}")
+  except (ValueError, TypeError):
+    return {}
+
+
 def sub_agent_result_to_kernel(result: SubAgentResult) -> dict[str, Any]:
   final = result.result.final_message
   final_kernel = None
@@ -175,7 +186,7 @@ def sub_agent_result_to_kernel(result: SubAgentResult) -> dict[str, Any]:
       "role": getattr(final, "role", "assistant"),
       "content": getattr(final, "content", ""),
       "tool_calls": [
-        {"id": c.id, "name": c.name, "arguments": json.loads(c.arguments or "{}")}
+        {"id": c.id, "name": c.name, "arguments": _safe_parse_tool_args(c.arguments)}
         for c in tool_calls
       ],
     }

{deepstrike-0.2.24 → deepstrike-0.2.26}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "deepstrike"
-version = "0.2.24"
+version = "0.2.26"
 requires-python = ">=3.10"
 readme = "README.md"
 dependencies = [